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

src/views/contractManagement/inspectInfo.vue

@@ -113,7 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

src/views/houseSelfCollect/inspectInfo.vue

@@ -113,7 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -364,8 +364,11 @@
 
               </ws-info-table>
 
-              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录：</span>
+              <!-- <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录：</span>
                 <el-switch v-model="value1"></el-switch>
+              </div> -->
+              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 
+               
               </div>
               <ws-info-table v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
                 <ws-form-item label="等级" span="1" prop="outType">

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -612,6 +612,7 @@
             })
             .toPromise()
             .then((response) => {
+              debugger
               this.dialogDataList = [] //点击确认时先清空要打印的数组
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
@@ -634,6 +635,9 @@
                 this.dialogDataList.push(_datas)
               } else {
                 this.dialogData.companyName = this.companyName
+                if(this.dialogData&&this.dialogData.contractManagement){
+                  this.dialogData.customer = this.dialogData.contractManagement.seller
+                }
                 this.dialogDataList.push(this.dialogData)
               }
               this.printBig('', this.radio)