瀏覽代碼

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 年之前
父節點
當前提交
854de70305

+ 1 - 1
public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>logo.png">
+    <!-- <link rel="icon" href="<%= BASE_URL %>logo.png"> -->
     <title><%= VUE_APP_PRO_NAME %></title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <!-- require cdn assets css -->

+ 0 - 0
public/logo.png → public/logo1.png


+ 0 - 0
src/assets/logo.png → src/assets/logo1.png


+ 3 - 3
src/components/tools/Logo.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import LogoSvg from '@/assets/logo.png'
+// import LogoSvg from '@/assets/logo.png'
 
 export default {
   name: 'Logo',
@@ -31,8 +31,8 @@ export default {
   },
   data () {
     return {
-      LogoSvg: LogoSvg,
-      logo: require(process.env.VUE_APP_LOGO) //  logo
+      // LogoSvg: LogoSvg,
+      // logo: require(process.env.VUE_APP_LOGO) //  logo
     }
   }
 }

+ 1 - 1
src/layouts/UserLayout.vue

@@ -42,7 +42,7 @@ export default {
       title: process.env.VUE_APP_PRO_NAME,
       company: process.env.VUE_APP_COM_NAME, //  公司
       icp: process.env.VUE_APP_ICP, //  备案号
-      logo: require(process.env.VUE_APP_LOGO) //  logo
+      // logo: require(process.env.VUE_APP_LOGO) //  logo
     }
   },
   mounted () {

+ 1 - 0
src/views/allocationManagement/storeTransferOut/basicInfoModal.vue

@@ -164,6 +164,7 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
+        this.$refs.custList.resetForm()
       } else {
         this.getPutPersonTypeList()
         this.getStoreCallOutTypeAllList()

+ 7 - 5
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -32,8 +32,7 @@
             </a-select-option>
           </a-select>
         </a-form-model-item>
-        <a-form-model-item>
-          <span slot="label"><i style="color: red;">*</i> 收货地址</span>
+        <a-form-model-item label="收货地址" prop="consigneeTel">
           {{ chooseAddr }}
           <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
         </a-form-model-item>
@@ -91,6 +90,9 @@ export default {
         ],
         settleStyleSn: [
           { required: true, message: '请选择支付方式', trigger: 'change' }
+        ],
+        consigneeTel: [
+          { required: true, message: '请选择收货地址(联系电话不能为空)', trigger: 'change' }
         ]
       },
       purchaseTragetType: [],
@@ -140,10 +142,10 @@ export default {
               _this.isShow = false
               _this.$emit('ok', res.data)
               _this.spinning = false
+              _this.$message.info(res.message)
             } else {
               _this.spinning = false
             }
-            _this.$message.info(res.message)
           })
         } else {
           return false
@@ -160,7 +162,7 @@ export default {
     },
     //  地址保存
     handleOk (data) {
-      this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '') + ')' + ' ' + (data.address || '')
+      this.chooseAddr = (data.consigneeName || '') + '(' + (data.consigneeTel || '--') + ')' + ' ' + (data.address || '')
       this.addressVal = '更换地址'
       this.form.shippingAddressProvinceName = data.provinceName // 省
       this.form.shippingAddressCityName = data.cityName // 市
@@ -173,7 +175,7 @@ export default {
     // 编辑信息
     setData (data) {
       this.form = JSON.parse(JSON.stringify(data))
-      this.chooseAddr = data.consigneeName + '(' + data.consigneeTel + ')' + ' ' + data.shippingAddressProvinceName + '-' + data.shippingAddressCityName + '-' + data.shippingAddressCountyName + ' ' + data.shippingAddress
+      this.chooseAddr = data.consigneeName + '(' + (data.consigneeTel || '--') + ')' + ' ' + data.shippingAddressProvinceName + '-' + data.shippingAddressCityName + '-' + data.shippingAddressCountyName + ' ' + data.shippingAddress
       this.addressVal = '更换地址'
     },
     // 获取收款方式

+ 1 - 0
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -202,6 +202,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.$refs.table.clearTable()
       } else {
         const _this = this
         setTimeout(() => {

+ 5 - 1
src/views/salesManagement/giftRecord/list.vue

@@ -150,7 +150,11 @@ export default {
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
+    })
   }
 }
 </script>

+ 5 - 4
src/views/salesManagement/salesman/editModal.vue

@@ -212,6 +212,9 @@ export default {
         idCard: '', // 身份证号
         entryDate: undefined // 入职时间
       }
+      // this.$nextTick(() => {
+      //   this.$refs.ruleForm.resetFields()
+      // })
     }
   },
   watch: {
@@ -224,18 +227,16 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.$refs.ruleForm.resetFields()
       }
     },
     itemId (newValue, oldValue) {
       if (this.isShow && newValue) {
         this.getDetail()
-      } else {
-        this.$refs.ruleForm.resetFields()
       }
     },
     modalTitle (newValue, oldValue) {
-      if (this.isShow && newValue) {
+      console.log(newValue)
+      if (newValue) {
         if (newValue == '编辑' || newValue == '新增') {
           this.isView = false
         } else {

+ 7 - 0
src/views/salesManagement/salesman/list.vue

@@ -214,6 +214,13 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
+    })
   }
 }
 </script>

+ 5 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -165,7 +165,11 @@ export default {
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
+    })
   }
 }
 </script>