前端 sdy

src/views/houseSelfCollect/inspectInfo.vue

@@ -58,8 +58,7 @@
               size="small" />
           </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabled1"
-                @change="waterContentChange">
+              <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabledName" @change="waterContentChange">
                 <ws-option v-for="item in goodNameList" :key="item.goodsName" :label="item.goodsName"
                   :value="item.goodsName" />
               </ws-select>
@@ -198,6 +197,7 @@
         disabled: false,
         disabled1: false,
         disabled2: false,
+        disabledName:false,
         types: '1',
         information: '添加初检',
         goodNameList: [],
@@ -247,18 +247,22 @@
       if (this.types == 2) {
         this.disabled = true
         this.disabled1 = true
+        this.disabledName = true
         this.information = '查看质检'
       } else if (this.types == 3) {
         this.disabled = false
         this.disabled1 = true
+        this.disabledName = true
         this.information = '编辑初检'
       }else if (this.types == 4) {
         this.disabled = true
         this.disabled1 = true
+        this.disabledName = true
         this.information = '编辑复检'
       }else if (this.types == 5) {
         this.disabled = false
         this.disabled1 = true
+        this.disabledName = false
         this.information = '确认质检'
       }
       else{

src/views/warehouse/warehouseManagementList.vue

@@ -433,11 +433,14 @@ export default {
         var strDate = date.getDate()
         this.parameter.startDate = ""+year+"-"+month+"-"+(strDate-1)
         this.parameter.endDate = ""+year+"-"+month+"-"+strDate
-      this.isShowPrintType = true
+        this.$forceUpdate();
+        this.isShowPrintType = true
     },
     removePrint(){
+      this.parameter.warehouseName = ""
+      this.parameter.proportion = ""
         this.isShowPrintType = false
-        this.parameter = {}
+        
     },
     async submitClick(){
       if(!this.parameter.radio && this.headerText == "打印记录"){
@@ -518,13 +521,11 @@ export default {
                   if(increment > 0){
                     let index = Math.round(Math.random()*response1.length - 1)
                     let pro = response1[index]  //取出假数据并设定值
-                    
-                    //  pro.inOutDate = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].inOutDate
-                    //  pro.contractNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].contractNo
-                    //  pro.companyName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].companyName
-                    //  pro.goodsName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].goodsName + "1"
-                    //  pro.boxNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].boxNo
-                  console.log(warehousePrint)
+                     pro.inOutDate = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].inOutDate
+                     pro.contractNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].contractNo
+                     pro.companyName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].companyName
+                     pro.goodsName = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].goodsName 
+                     pro.boxNo = warehousePrint[Math.round(Math.random()* warehousePrint.length - 1)].boxNo
                     pro.netWeight = Number((Math.random()*(70-10+1)+10).toFixed(2))
                      pro.tare = Number((Math.random()*(20-10+1)+10).toFixed(2))
                     pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
@@ -532,11 +533,11 @@ export default {
                          increment = (increment - pro.netWeight).toFixed(2)  //所要增的量
                         if(increment < 10 && pro.netWeight <= 60){
                         pro.netWeight += Number(increment)
-                                 pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
+                        pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
                         increment = 0
                          warehousePrint.push(pro)
                           }else{
-                              warehousePrint.push(pro)
+                          warehousePrint.push(pro)
                           }
                       }else{
                           pro.netWeight = Number(increment.toFixed(2))