From 666f51d434735236b10de307eb0a4bbff44ad217 Mon Sep 17 00:00:00 2001
From: zichen1019 <1510748736@qq.com>
Date: Thu, 12 Aug 2021 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=8A=E4=BC=98=E5=8C=96=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E4=BF=9D=E5=AD=98=E6=97=B6=E4=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawerDialog/index.vue | 56 +++++++++++++++++++++------
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/src/components/drawerDialog/index.vue b/src/components/drawerDialog/index.vue
index cfe94c2..83a2987 100644
--- a/src/components/drawerDialog/index.vue
+++ b/src/components/drawerDialog/index.vue
@@ -23,12 +23,21 @@
               :model="formTemplate"
               class="small-space"
               label-position="left"
-              label-width="80px"
+              label-width="110px"
               style="margin-left: 50px"
             >
               <el-form-item label="模板名称" prop="tempName" required>
                 <el-input v-model="formTemplate.tempName" type="text" style="width:400px" />
               </el-form-item>
+              <el-form-item label="通用模板文件名" prop="commonFilename">
+                <el-input v-model="formTemplate.commonFilename" type="text" style="width:400px" />
+                <el-alert
+                  type="warning"
+                  title="用于处理多类别品种下或多检验类别下对应一份模板的情况，为空时取模板名称"
+                  style="display: inline"
+                  :closable="false"
+                />
+              </el-form-item>
               <el-form-item label="模板类型" prop="tempCategory" required>
                 <el-select
                   v-model="formTemplate.tempCategory"
@@ -268,7 +277,7 @@
                   >
                     <template slot-scope="scope">
                       <div>
-                        {{ scope.row.writeMode && writeModes[scope.row.writeMode] }}
+                        {{ writeModes[scope.row.writeMode] }}
                       </div>
                     </template>
                   </el-table-column>
@@ -305,7 +314,7 @@
                   >
                     <template slot-scope="scope">
                       <div>
-                        {{ scope.row.tableType === 1 ? "检验项目" : "目录页" }}
+                        {{ scope.row.tableType === 0 ? "检验项目" : "目录页" }}
                       </div>
                     </template>
                   </el-table-column>
@@ -474,6 +483,17 @@
     </el-dialog>
     <el-dialog title="新增" :visible.sync="dialogVisible1" width="50%" @close="close">
       <el-form ref="templateSettingForm" :model="form">
+        <el-form-item
+          label="检验项目模式"
+          prop="writeMode"
+          label-width="150px"
+        >
+          <el-radio-group v-model="form.jyxmMode">
+            <el-radio v-for="(item, jyxmModeIndex) in jyxmModes" :key="jyxmModeIndex" :label="jyxmModeIndex">
+              {{ item }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="检验项目索引" prop="sort" label-width="150px">
           <el-input-number v-model="form.sort" :min="0" :max="100" />
           <el-alert
@@ -621,10 +641,10 @@
           prop="tableType"
           label-width="150px"
         >
-          <el-radio v-model="form.tableType" :label="1">
+          <el-radio v-model="form.tableType" :label="0">
             检验项目
           </el-radio>
-          <el-radio v-model="form.tableType" :label="2">
+          <el-radio v-model="form.tableType" :label="1">
             目录页
           </el-radio>
         </el-form-item>
@@ -639,6 +659,23 @@
             inactive-text="不是"
           />
         </el-form-item>
+        <el-form-item
+          label="检验项目列数据转换"
+          prop="hasJyxmFiledValueConvertState"
+          label-width="150px"
+        >
+          <el-switch
+            v-model="form.hasJyxmFiledValueConvertState"
+            active-text="存在"
+            inactive-text="不存在"
+          />
+          <el-alert
+            type="warning"
+            title="例如存在用户签名字段则为true，如果为false并且写入模式为CN或DN模式时，不需要配置检验项目列！"
+            style="display: inline"
+            :closable="false"
+          />
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible1 = false">取 消</el-button>
@@ -767,6 +804,7 @@ export default {
         templateSettingId: ''
       },
       totalCount1: 0,
+      jyxmModes: ['检验项目', '附表', '不合格整改检验项目', '大型起重机械检验项目', '报告检验项目'],
       writeModes: ['CN模式', 'DN模式', 'KV模式', 'CFI模式', 'SA模式']
     }
   },
@@ -904,11 +942,7 @@ export default {
     },
     editFn(row) {
       this.dialogVisible = true
-      this.formLabelAlign.field = row.filed
-      this.formLabelAlign.fieldMode = row.fieldMode
-      this.formLabelAlign.indexFromRight = row.indexFromRight
-      this.formLabelAlign.templateSettingId = row.id
-      this.formLabelAlign.templateId = this.id
+      this.formLabelAlign = this.common.deepCopy(row)
     },
     handleChange(value) {
       this.formLabelAlign.indexFromRight = value
@@ -918,7 +952,7 @@ export default {
       this.formLabelAlign.templateId = this.id
       this.api({
         url: '/templateJyxm',
-        method: 'post',
+        method: this.formLabelAlign.id ? 'put' : 'post',
         data: this.formLabelAlign
       }).then((res) => {
         this.dialogVisible = false