优化调整原始记录与报告的检验结果转换

src/components/drawerDialog/index.vue

@@ -478,6 +478,27 @@
         >
           <el-input v-model="formLabelAlign.field" />
         </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="16">
+            <el-form-item
+              label="字段别名"
+              prop="alias"
+              :rules="[{ required: true, message: '请输入字段别名', trigger: 'blur' }]"
+            >
+              <el-input v-model="formLabelAlign.alias" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-alert type="warning" title="简化word模板上写的字段名称" style="display: inline" :closable="false" />
+          </el-col>
+        </el-row>
+        <el-form-item
+          label="下换线拼接"
+          prop="underlineStitching"
+          :rules="[{ required: true, message: '请输入字段名', trigger: 'blur' }]"
+        >
+          <el-switch v-model="formLabelAlign.underlineStitching" />
+        </el-form-item>
         <el-form-item
           label="从右往左数对应的索引"
           prod="indexFromRight"

src/views/ysjl/3000/common/inspection-items.vue

@@ -40,34 +40,14 @@
             class="inline-input"
             style="width: 100%"
             :fetch-suggestions="querySearchJyjg"
-            @select="(val) => changeFn(val.value, scope.row)"
+            @input="(val) => changeFn(val, scope.row)"
           />
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        align="center"
-        prop="gongzuojianzheng"
-        min-width="200"
-        label="检验结论"
-      >
-        <template slot-scope="scope">
-          <el-autocomplete
-            v-model="scope.row.gongzuojianzheng"
-            class="inline-input"
-            style="width: 100%"
-            :fetch-suggestions="
-              (queryString, cb) => {
-                querySearchGzjz(queryString, cb, scope.$index);
-              }
-            "
-          />
-        </template>
-      </el-table-column> -->
     </el-table>
   </div>
 </template>
 <script>
-// import Technical from '@/views/ysjl/3000/common/technical-parameter'
 
 export default {
   name: 'Inspection',
@@ -100,18 +80,25 @@ export default {
     querySearchJyjg: function(queryString, cb, $index) {
       cb(this.jyjgList)
     },
+    change(row) {
+      console.log(row)
+    },
     changeFn(val, row) {
       const jybgJyjgJyxm = this.jybgData[row.jybgJyjgIndex - 1]
+      let beizhu = ''
+      if (val.length > 1) {
+        beizhu = val.substr(1)
+      }
       if (val.indexOf('X') === 0) {
-        jybgJyjgJyxm.jianyanjieguo = '不符合'
+        jybgJyjgJyxm.jianyanjieguo = '不符合' + beizhu
       } else if (val.indexOf('√') === 0) {
         let jyjg = '符合'
         if (row.xiangmuleibie === 'C') {
           jyjg = '资料确认符合'
         }
-        jybgJyjgJyxm.jianyanjieguo = jyjg
+        jybgJyjgJyxm.jianyanjieguo = jyjg + beizhu
       } else if (val.indexOf('/') === 0) {
-        jybgJyjgJyxm.jianyanjieguo = '无此项'
+        jybgJyjgJyxm.jianyanjieguo = '无此项' + beizhu
       } else {
         jybgJyjgJyxm.jianyanjieguo = ''
       }

src/views/ysjl/5000/dj/lygg-cl/index.vue

@@ -462,7 +462,6 @@ export default {
       this.getMaxBh()
     } else {
       this.getYsjl(this.$route.query.id)
-
     }
     this.getDepartment()
   },
@@ -536,7 +535,6 @@ export default {
         }
       }).then(data => {
         this.ysjl = data.ysjl
-              this.getJyxm(1)
         this.param = (data.param !== null && data.param !== undefined) ? data.param : {}
         this.ysjl.jianyanjieshuriqi = this.formatter.dateFormat('YYYY-MM-dd')
         this.getXcjyrq()
@@ -550,6 +548,7 @@ export default {
         // 制造日期、投用日期、上次检验日期设置成正确的日期格式
         this.ysjl.zhizaoriqi = this.common.checkDateFormat(this.ysjl.zhizaoriqi)
         this.ysjl.gaizaoriqi = this.common.checkDateFormat(this.ysjl.gaizaoriqi)
+        this.getJyxm(1)
       })
     },
     getYsjl(id) {
@@ -561,7 +560,6 @@ export default {
         }
       }).then(data => {
         this.ysjl = data
-              this.getJyxm(1)
         this.departmentId = this.ysjl.departmentId
         if (this.ysjl.jianyanrenyuan !== null && this.ysjl.jianyanrenyuan.length > 0) {
           this.jianyanrenyuan = this.common.convertCnName(this.ysjl.jianyanrenyuan)
@@ -571,6 +569,7 @@ export default {
           this.getMaxBh()
         }
         this.getParam(this.ysjl.id, this.ysjl.shebeizhongleidaima)
+        this.getJyxm(1)
       })
     },
     handleChange(v) {