1

src/views/inspectionWork/components/baseInfo.vue

@@ -194,36 +194,19 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="6" v-if="$store.state.user.info.clientEnvironmentId=='10'">
+          <el-form-item label="客户" prop="contactName">
+            <el-input v-model="form.contactName" disabled></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="接收人部门" prop="groupId">
-            <!-- <deptSelect
-              :disabled="btnType == 'detail' || form.qualityType == 2"
-              v-model="form.groupId"
-              @changeGroup="searchDeptNodeClick"
-            /> -->
             <el-input v-model="form.groupName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="接收人" prop="qualityIdList">
             <el-input v-model="form.qualityName" disabled></el-input>
-            <!-- <el-select
-              :disabled="btnType == 'detail' || form.qualityType == 2"
-              v-model="form.qualityIdList"
-              @change="changeExecutor"
-              size="small"
-              style="width: 100%"
-              filterable
-              multiple
-            >
-              <el-option
-                v-for="item in executorList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select> -->
           </el-form-item>
         </el-col>
 

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -254,13 +254,13 @@
           </template>
           <el-table-column
             label="图片"
-            prop="imgUrl"
+            prop="attachmentUrl"
             align="center"
             :show-overflow-tooltip="true"
           >
             <template slot-scope="scope">
               <span
-                ><fileMain v-model="scope.row.imgUrl" type="view"></fileMain
+                ><fileMain v-model="scope.row.attachmentUrl" type="view"></fileMain
               ></span>
             </template>
           </el-table-column>
@@ -504,9 +504,9 @@
             prop="inspectionName"
             align="center"
           ></el-table-column>
-          <el-table-column label="附件" prop="imgUrl" align="center">
+          <el-table-column label="附件" prop="attachmentUrl" align="center">
             <template slot-scope="scope">
-              <fileMain v-model="scope.row.imgUrl" type="view"></fileMain>
+              <fileMain v-model="scope.row.attachmentUrl" type="view"></fileMain>
             </template>
           </el-table-column>
           <el-table-column

src/views/inspectionWork/details.vue

@@ -84,11 +84,11 @@
                   <el-input :value="form.executeUserName" disabled />
                 </el-form-item>
               </el-col>
-        <el-col :span="6" v-if="form.assignType == 1">
-          <el-form-item label="场站" prop="productLineId">
-          <input v-model="form.productLineName" disabled></input>
-          </el-form-item>
-        </el-col>
+              <el-col :span="6" v-if="form.assignType == 1">
+                <el-form-item label="场站" prop="productLineId">
+                  <el-input v-model="form.productLineName" disabled></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="检测时间">
                   <el-input :value="qualityTime" disabled />
@@ -342,15 +342,10 @@
                     {{ row.categoryCode }}
                   </el-link>
                 </template>
-                <template v-slot:imgUrl="{ row, $index }">
-                  <fileMian
-                    type="view"
-                   v-model="row.imgUrl"
-                  >
-                  </fileMian>
-                </template>
-              </ele-pro-table></el-tab-pane
-            >
+                <template v-slot:attachmentUrl="{ row, $index }">
+                  <fileMian type="view" v-model="row.attachmentUrl"> </fileMian>
+                </template> </ele-pro-table
+            ></el-tab-pane>
             <el-tab-pane label="检测方案" name="3">
               <ele-pro-table
                 :columns="tableColumns3"

src/views/inspectionWork/edit.vue

@@ -1246,6 +1246,21 @@
             this.form.executeUserIdList = [this.$store.state.user.info.userId];
             this.form.executeUserName = this.$store.state.user.info.name;
           }
+          //宇信
+          if (this.$store.state.user.info.clientEnvironmentId == 10) {
+            //客户:5#和6#默认是重油公司7#默认是红山 2008389016775864321==7#
+            if (this.form.productLineId == '2008389016775864321') {
+              this.form.contactId =
+                this.form.contactId || '2008562263580520449';
+              this.form.contactName =
+                this.form.contactName || '克拉玛依红山油田有限责任公司';
+            } else {
+              this.form.contactId =
+                this.form.contactId || '2008383566202318850';
+              this.form.contactName =
+                this.form.contactName || '中国石油新疆油田分公司(重油公司)';
+            }
+          }
 
           if (this.form.groupId) {
             this.$nextTick(() => {

src/views/sample/sampleRecord/components/addSample.vue

@@ -286,10 +286,10 @@
         height="400px"
         full-height="calc(100vh - 120px)"
       >
-        <!-- <template>imgUrl</template> -->
-        <template v-slot:imgUrl="{ row, $index }">
+        <!-- <template>attachmentUrl</template> -->
+        <template v-slot:attachmentUrl="{ row, $index }">
           <fileMain
-            v-model="row.imgUrl"
+            v-model="row.attachmentUrl"
             :directoryId="
               $store.state.user.info.clientEnvironmentId == 10
                 ? '2065608790337171458'
@@ -438,8 +438,8 @@
           },
           {
             label: '照片',
-            prop: 'imgUrl',
-            slot: 'imgUrl',
+            prop: 'attachmentUrl',
+            slot: 'attachmentUrl',
             width:150,
             align: 'center'
           },
@@ -1224,6 +1224,7 @@
             ...item,
             measureQuantity: item.measureQuantity, //作为计量数量
             sampleCode: codeList[index],
+            attachmentUrl:[],
             qualitySampleTemplateList
           });
           // }