bug修复

src/components/CustomerFollow/index.vue

@@ -158,7 +158,7 @@ export default {
   },
 
   created() {
-    this.resetCustomerFollowForm()
+    // this.resetCustomerFollowForm()
     if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
       this.customerContactsList = r.data
       this.customerFollow.form.customerId = this.customerId
@@ -213,6 +213,7 @@ export default {
       this.customerFollow.dialogVisible = false
     },
     resetCustomerFollowForm() {
+      console.log(11)
       this.customerFollow.form = {
         "bizId": this.id,
         "contactName": undefined,

src/components/CustomerFollowList/index.vue

@@ -11,7 +11,6 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="跟进类型" required>
-              <span>{{form.followType}}</span>
               <dict-selector ref="dictTag" form-type="radio" v-model="form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector>
             </el-form-item>
           </el-col>
@@ -104,7 +103,7 @@ export default {
   },
 
   created() {
-    this.resetCustomerFollowForm()
+    // this.resetCustomerFollowForm()
     if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
       this.customerContactsList = r.data
       // this.$set(form, 'customerId', this.customerId)

src/components/FileUpload/index.vue

@@ -73,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload", // 上传的文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/org-name/up", // 上传的文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },

src/views/ecw/order/weightDeal.vue

@@ -74,9 +74,9 @@
             </el-table-column>
             <el-table-column :label="$t('入库货物属性')" align="center" >
               <template slot-scope="scope">
-                 <span>{{$t('品牌')}}：{{scope.row.boxGauge||0}}</span>
+                 <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
                  <p>
-                  <span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
+                  <span>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
                   <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
                   <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
                   <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>