Merge remote-tracking branch 'origin/release2.2new' into release2.2new

src/views/ecw/banner/index.vue

@@ -326,7 +326,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'bannerUrlWeb', response.data);
           // this.form.img = response.data;
@@ -342,7 +342,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'bannerUrlApp', response.data);
           // this.form.img = response.data;

src/views/ecw/financial/creatCollection.vue

@@ -1300,7 +1300,7 @@ export default {
         this.flag = false
         return
       }
-      this.form.customerName = value.name
+      this.form.customerName = value.payerName?value.payerName:value.name
       this.form.customerId && getCustomer(this.form.customerId).then(res => {
         this.form = {
           ...this.form,

src/views/ecw/financial/printVoucher.vue

@@ -12,7 +12,7 @@
               <td style="font-weight: bold;width:12.5%">{{$t('部门')}}</td>
               <td style="width:12.5%">{{form?form.departmentName:$t('无')}}</td>
               <td style="font-weight: bold;width:12.5%">{{$t('客户名称')}}</td>
-              <td colspan="2" style="width: 25%;">{{form.payerName?form.payerName:(form.customerName||$t('无'))}}</td>
+              <td colspan="2" style="width: 25%;">{{form.customerName||$t('无')}}</td>
               <td style="font-weight: bold;width:12.5%">{{$t('收款日期')}}</td>
               <td colspan="2" style="width: 25%;">{{form&&form.payedAt?parseTime(form.payedAt):$t('无')}}</td>
             </tr>

src/views/ecw/financial/receiptDetail.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item :label="$t('状态')">
           <dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="form.state"/>
         </el-descriptions-item>
-        <el-descriptions-item :label="$t('客户')">{{form.payerName?form.payerName:form.customerName }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('客户')">{{form.customerName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('部门')">{{ form.departmentName }}</el-descriptions-item>
         <el-descriptions-item :label="$t('业务员')">{{ form.salesmanName }}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('手续费（RMB）')">{{ form.feeRate }}</el-descriptions-item> -->
@@ -725,9 +725,9 @@ export default {
       this.id = this.$route.query.id;
       await getReceiptInfoByIds({ id: this.id }).then(res => {
         this.form = res.data
-        getCustomer(this.form.customerId).then(res => {
-          this.form.customerName = res?.data?.name
-        })
+        // getCustomer(this.form.customerId).then(res => {
+        //   this.form.customerName = res?.data?.name
+        // })
         var dept = this.deptData.filter((itt) => itt.id == res.data.departmentId);
         // console.log(dept)
         if(dept.length>0){

src/views/ecw/order/index.vue

@@ -452,7 +452,7 @@
                 <template v-if="
                   exclude(scope.row.status, [0, 2]) &&
                   exclude(scope.row.shipmentState, [320,322,323]) &&
-                  exclude(scope.row.abnormalState, [1, 5,6,7,8])
+                  exclude(scope.row.abnormalState, [5,6,7,8])
                 ">
                   <el-dropdown-item @click.native="printWarehouseReceiptOrderId=scope.row.orderId" v-hasPermi="['ecw:order:warehouse_receipt']">{{$t('打印入仓单')}}</el-dropdown-item>
                 </template>

src/views/ecw/product/index.vue

@@ -601,7 +601,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'imgs', response.data);
           // this.form.img = response.data;

src/views/ecw/warehouse/index.vue

@@ -811,7 +811,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'img', response.data);
           // this.form.img = response.data;

src/views/system/version/index.vue

@@ -324,7 +324,7 @@ export default {
 
     /** 处理上传的文件发生变化 */
     handleFileChange(file, fileList) {
-      this.upload.data.path = this.uuid() + "/" + file.name;
+      // this.upload.data.path = this.uuid() + "/" + file.name;
     },
 
     /** 文件上传成功处理 */
@@ -355,7 +355,7 @@ export default {
         let formData = new FormData();
         // console.log(file);
         formData.append("file", file);
-        formData.append("path", this.uuid() + "/" + file.name);
+        // formData.append("path", this.uuid() + "/" + file.name);
         uploadFile(formData).then(response => {
           this.$set(this.form, 'appUrl', response.data);
           // this.form.img = response.data;