更新

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -105,14 +105,6 @@
                 <ws-form-item v-if='statusTypetext!="初检"&&serviceManagementType==1' label="经办人" span="1" prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
-                <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
-                <ws-form-item label="干粮单价（元/公斤）" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==3' label="类型" span="1" prop="type">
                   <ws-select v-model="deptBudgetList.type" disabled>
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
@@ -188,6 +180,14 @@
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
                 </ws-form-item>
+                  <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
+                <ws-form-item label="干粮单价（元/公斤）" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
               </ws-info-table>
 
               <div class="title">质检数据</div>

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -140,7 +140,7 @@
               <div class="but">
                 <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
                 <el-button @click="print" v-if="information == '毛重'" type="primary">保存</el-button>
-                <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">保存并打印
+                <el-button @click="print(1)" v-if="information == '皮重'" type="primary" :disabled="submitAllow">保存并打印
                 </el-button>
               </div>
             </div>
@@ -220,14 +220,13 @@
     <div class="mask" v-show="isShowPrintType"></div>
     <div class="print-type" v-show="isShowPrintType">
       <div class="print-type-content">
-        <div class="print-type-title">请选择打印纸张类型</div>
+        <div class="print-type-title">请选择打印类型</div>
         <div class="print-type-checkbox">
           <!-- <el-radio-group v-model="radio">
             <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
             <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
           </el-radio-group> -->
         </div>
-
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
           <div>收货单位：</div>
           <!-- <div>{{companyName}}</div> -->
@@ -375,6 +374,47 @@
         submitAllow: false,
         id: "",
         inOutDate: {},
+        idPrint:"",
+        ewCustomerOptions: [{
+            value: '黑龙江利润元粮食贸易有限公司',
+            label: '黑龙江利润元粮食贸易有限公司'
+          }, {
+            value: '黑龙江众利合粮食贸易有限公司',
+            label: '黑龙江众利合粮食贸易有限公司'
+          }, {
+            value: '黑龙江鑫满仓粮食贸易有限公司',
+            label: '黑龙江鑫满仓粮食贸易有限公司'
+          }, {
+            value: '黑龙江中天昊元贸易有限公司',
+            label: '黑龙江中天昊元贸易有限公司'
+          }],
+        companyNameOptions: [{
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, ],
+        companyNameEWOptions: [{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        }],
+        companyName: '黑龙江利润元粮食贸易有限公司',
+        companyNameEW: "厦门建发物产有限公司",
+        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+         ewradio: '',
+        ddchecked: false,
+        checked: false,
+        isShowPrintType:false,
+        dialogDataList:[],
+        jjSelectPrintList:[],
+        printSeparately:false,
       }
     },
     activated() {
@@ -452,6 +492,61 @@
 
     },
     methods: {
+      changeEw(e) {
+        this.ddchecked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+        changeEwDD(e) {
+        this.checked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+       typePrintCannelClick() {
+           this.ddchecked =  false,
+        this.checked = false,
+        this.dialogDataList = []//打个打印取消时数组至空
+        this.isShowPrintType = false
+      },
+      async typePrintClick(type) {
+           getPrint({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              this.dialogDataList = []//点击确认时先清空要打印的数组
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              if (this.checked) {
+                this.dialogDataList.push( this.dialogData)
+                var _datas = JSON.stringify(this.dialogData) 
+                _datas = JSON.parse(_datas)
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else if(this.ddchecked){
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else{
+                this.dialogData.compName = this.companyName
+                this.dialogDataList.push( this.dialogData)
+             }
+             console.log("dsdi",this.dialogDataList)
+              window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
+              // this.printBig("", this.radio)
+            })
+            .catch((response) => {})
+      },
       warehouseNameChange() {
         localStorage.setItem('ck', this.warehouseName)
         this.weighingList.warehouseName = this.warehouseName
@@ -1177,6 +1272,8 @@
                     title: '成功',
                     message: '保存成功',
                   })
+                  this.idPrint = response
+                  this.isShowPrintType = true
                   this.getList()
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {
@@ -1197,22 +1294,6 @@
                       addstorageputList(inOutDate).toPromise().then((response) => {})
                     })
                   }
-                  getPrint({
-                      id: response,
-                    })
-                    .toPromise()
-                    .then((response) => {
-                      this.isShowPrint = true
-                      this.inspect = response
-                      // this.inspect.qrCodeUrl = res
-                      if (response.compName == '黑龙江秋收有限公司') {
-                        this.inspect.compName = '黑龙江中天昊元贸易有限公司'
-                      }
-                      this.inspect.a = '中天'
-                      // })
-                    })
-                    .catch((response) => {
-                    })
                 })
                 .catch((response) => {
                 })

src/views/houseSelfCollect/weighingManagement.vue

@@ -527,7 +527,7 @@
                 _datas.customer = this.ewCustomer
                 this.dialogDataList.push(_datas)
              }else{
-              this.dialogData.companyName = this.companyName
+              this.dialogData.compName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
               this.printBig("", this.radio)

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -236,13 +236,13 @@
        handleSelectionChange(val) {
         this.modification = val;
       },
-      batchPrint(){
-        if(this.modification.length == 0){
-          this.$message.error("请选择批量打印的条目！")
-          return
-        }
-        // this.isShowPrintType = true
-      },
+      // batchPrint(){
+      //   if(this.modification.length == 0){
+      //     this.$message.error("请选择批量打印的条目！")
+      //     return
+      //   }
+      //   // this.isShowPrintType = true
+      // },
       changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -346,6 +346,10 @@
     print(row, type, pageType) {
       //打印
         if (type == 1) {
+            if(this.modification.length == 0){
+              this.$message.error("请选择批量打印的条目！")
+              return
+            }
           this.isShowPrintType = true
         } else {
           this.idPrint = row.id