Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -3023,6 +3023,10 @@ export default {
       type: Number,
       required: null,
     },
+    copyStatus: {
+      type: Number,
+      required: null,
+    },
   },
   components: {
     UploadFile,
@@ -3452,28 +3456,32 @@ export default {
         if (this.form.fStltypeid || this.form.fStltypeid == 0) {
           this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
         }
-        this.detailList = response.data.warehouseBillsItem;
-        response.data.warehousebillsfeesCr.map((e) => {
-          if (e.fFeeunitid) {
-            e.fFeeunitid = e.fFeeunitid.toString();
-          }
-          if (e.fStltypeid||e.fStltypeid==0) {
-            e.fStltypeid = e.fStltypeid.toString();
-          }
-        });
-        this.warehouseCrList = response.data.warehousebillsfeesCr;
-        response.data.warehousebillsfeesDr.map((e) => {
-          if (e.fFeeunitid) {
-            e.fFeeunitid = e.fFeeunitid.toString();
-          }
-          if (e.fStltypeid||e.fStltypeid==0) {
-            e.fStltypeid = e.fStltypeid.toString();
+        if (!this.copyStatus) {
+          this.detailList = response.data.warehouseBillsItem;
+          response.data.warehousebillsfeesCr.map((e) => {
+            if (e.fFeeunitid) {
+              e.fFeeunitid = e.fFeeunitid.toString();
+            }
+            if (e.fStltypeid || e.fStltypeid == 0) {
+              e.fStltypeid = e.fStltypeid.toString();
+            }
+          });
+          this.warehouseCrList = response.data.warehousebillsfeesCr;
+          response.data.warehousebillsfeesDr.map((e) => {
+            if (e.fFeeunitid) {
+              e.fFeeunitid = e.fFeeunitid.toString();
+            }
+            if (e.fStltypeid || e.fStltypeid == 0) {
+              e.fStltypeid = e.fStltypeid.toString();
+            }
+          });
+          this.warehouseDrList = response.data.warehousebillsfeesDr;
+          this.CntrTable = response.data.tCntrList;
+          if (response.data.enclosures) {
+            this.relevantAttachments = response.data.enclosures;
           }
-        });
-        this.warehouseDrList = response.data.warehousebillsfeesDr;
-        this.CntrTable = response.data.tCntrList;
-        if (response.data.enclosures) {
-          this.relevantAttachments = response.data.enclosures;
+        }else{ 
+          this.$set(this.form, "fMblno", null);
         }
       });
     },

src/views/Warehousing/inStock/index.vue

@@ -258,7 +258,7 @@
             icon="el-icon-download"
             size="mini"
             :disabled="single"
-            @click="handleUpdate(null, 2)"
+            @click="copyUpdate"
             v-hasPermi="['agreement:agreementStorage:export']"
             >复制新增
           </el-button>
@@ -479,6 +479,7 @@
       @changeShow="showAddOrUpdate"
       ref="addOrUpdateRef"
       :chiId="formId"
+      :copyStatus="copyStatus"
       :key="timer"
     ></add-or-update>
   </div>
@@ -665,6 +666,7 @@ export default {
       multiple: true,
       formId: null,
       ids: [],
+      copyStatus:null,
     };
   },
   // 使用子组件
@@ -825,6 +827,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       const fId = row.fId || this.ids[0];
+      this.copyStatus=null
       this.formId = fId;
       this.$nextTick(() => {
         this.$refs.addOrUpdateRef.init();
@@ -834,6 +837,17 @@ export default {
         this.pageShow2 = true;
       }, 200);
     },
+    copyUpdate() {
+      this.formId = this.ids[0];
+      this.copyStatus = 2;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdateRef.init();
+      });
+      setTimeout(() => {
+        this.pageShow = false;
+        this.pageShow2 = true;
+      }, 200);
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;

src/views/jiGang/index.vue

@@ -458,7 +458,7 @@
               filterable
               :disabled="disabled"
               remote
-              :remote-method="corpsRemoteMethod"
+              :remote-method="corpsRemote"
               placeholder="客户名称"
             >
               <el-option
@@ -707,6 +707,15 @@ export default {
       listCorps(queryParams).then((response) => {
         console.log(response)
         this.fMblnoOptions = response.rows
+      })
+    },
+    corpsRemote(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = {pageNum: 1, fName: name, type: 2}
+      listCorps(queryParams).then((response) => {
+        console.log(response)
         this.blnoOptions = response.rows
       })
     },

src/views/reportManagement/singleTicket/index.vue

@@ -182,6 +182,26 @@ export default {
       listpayable(this.query).then(res=>{
         this.costData = res.data.feeList
         this.tableData = res.data.singleAnalysis
+        for (let item in this.tableData){
+          if (this.tableData[item].inQty == 0){
+            this.tableData[item].inQty = ''
+          }
+          if (this.tableData[item].inGrossweight == 0){
+            this.tableData[item].inGrossweight = ''
+          }
+          if (this.tableData[item].outGrossweight == 0){
+            this.tableData[item].outGrossweight = ''
+          }
+          if (this.tableData[item].fQtyblc == 0){
+            this.tableData[item].fQtyblc = ''
+          }
+          if (this.tableData[item].fGrossweightblc == 0){
+            this.tableData[item].fGrossweightblc = ''
+          }
+          if (this.tableData[item].outQty == 0){
+            this.tableData[item].outQty = ''
+          }
+        }
         this.formInline.goodsName = res.data.goodsName
       })
     },