Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -473,7 +473,7 @@
         appendixIdsAdd: '',
         excelFreightspace: [],
         goodnameList:[],
-        goodsName:"全部",
+        goodsName:'全部',
       }
     },
     mounted() {debugger
@@ -574,6 +574,7 @@
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
               obj.qualityDate = _this.formatDate(v.日期,'-')
+              obj.deductionAmount = v.扣款
               _this.excelFreightspace.push(obj)
             })
             if (_this.excelFreightspace) {
@@ -799,7 +800,7 @@
             if (response.length > 0) {
               var arr = []
               for (let i = 0; i < response.length; i++) {
-                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/',"")
+                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/','')
                 arr.push({
                   fileUrl: response[i],
                   renameFileName: _name,
@@ -1260,7 +1261,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
-            goodsName:this.goodsName == '全部'?"":this.goodsName
+            goodsName:this.goodsName == '全部'?'':this.goodsName
           })
           .toPromise()
           .then((response) => {

src/views/warehousenew/warehouseManagementList.vue

@@ -218,6 +218,7 @@
             <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName">
               <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable clearable>
+                 <el-option key="" label="全部仓库" value="全部仓库" />
                 <el-option v-for="item in warehouseAllXiaLa" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName" />
               </el-select>
             </el-form-item>
@@ -349,6 +350,7 @@
         this.isShowPrintType = false
       },
       async submitClick() {
+       
         if (!this.parameter.radio && this.headerText == '打印记录') {
           this.$message.error('请选择打印的类型')
           return
@@ -368,6 +370,9 @@
         if (!this.parameter.warehouseName) {
           this.$message.error('请选择所要打印的仓库')
           return
+        }
+         if(this.parameter.warehouseName == "全部仓库"){
+          this.parameter.warehouseName = ""
         }
         this.parameter.warehouseName = this.parameter.warehouseName.replace("（临）","")
         if (this.headerText == '导出记录') {