稽查增加配置‘是否修改前展示’

src/views/dictionary/checkConfig/index.vue

@@ -3,7 +3,8 @@
     <el-form :inline="true">
       <el-form-item label="模块">
         <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable>
-          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value"
+            :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -12,24 +13,10 @@
       </el-form-item>
     </el-form>
     <div>
-      <el-button
+      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
-        type="info"
-        plain
-        icon="el-icon-sort"
-        size="mini"
-        @click="toggleExpandAll"
-      >展开/折叠</el-button>
     </div>
-    <el-table
+    <el-table v-if="refreshTable" v-adaptive="{ bottomOffset: 45 }" v-loading="loading" height="100" :data="menuList"
-      v-if="refreshTable"
+      :default-expand-all="isExpandAll" row-key="Id" :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }">
-      v-adaptive="{bottomOffset:45}"
-      v-loading="loading"
-      height="100"
-      :data="menuList"
-      :default-expand-all="isExpandAll"
-      row-key="Id"
-      :tree-props="{children: 'Children', hasChildren: 'hasChildren'}"
-    >
       <el-table-column prop="ModuleTypeValueCN" label="模块" show-overflow-tooltip align="left" min-width="230px" />
       <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px">
         <template slot-scope="scope">
@@ -38,11 +25,21 @@
       </el-table-column>
       <el-table-column prop="DescriptionCN" label="其他" :show-overflow-tooltip="true" min-width="140px">
         <template slot-scope="scope">
-          <span v-if="!scope.row.IsEnable" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;" title="被禁用">禁</span>
+          <span v-if="!scope.row.IsEnable"
-          <span v-if="scope.row.IsHaveSign" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;" title="需要电签">签</span>
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;"
-          <span v-if="scope.row.IsHaveReason" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;" title="需要原因">因</span>
+            title="被禁用">禁</span>
-          <span v-if="scope.row.IsFinish" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;" title="已经记录">记</span>
+          <span v-if="scope.row.IsHaveSign"
-          <span v-if="scope.row.IsJoinPlan" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;" title="核对完">核</span>
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;"
+            title="需要电签">签</span>
+          <span v-if="scope.row.IsHaveReason"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;"
+            title="需要原因">因</span>
+          <span v-if="scope.row.IsFinish"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;"
+            title="已经记录">记</span>
+          <span v-if="scope.row.IsJoinPlan"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;"
+            title="核对完">核</span>
 
         </template>
       </el-table-column>
@@ -50,12 +47,7 @@
       <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
       <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
       <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column
+      <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
-        prop="Sort"
-        label="显示顺序"
-        min-width="80"
-        show-overflow-tooltip
-      />
       <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
@@ -66,38 +58,25 @@
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
+            type="text" @click="handleUpMove(scope.row)">上移</el-button>
-            @click="handleUpMove(scope.row)"
+          <el-button type="text" @click="handleUpdate(scope.row)">修改</el-button>
-          >上移</el-button>
-          <el-button
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
           <el-button
             v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            type="text"
+            type="text" @click="handleAdd(scope.row)">新增</el-button>
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
+            type="text" @click="handleChildren(scope.row)">Children</el-button>
-            @click="handleChildren(scope.row)"
-          >Children</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
+            type="text" @click="handleCopy(scope.row)">复制到</el-button>
-            @click="handleCopy(scope.row)"
+          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
-          >复制到</el-button>
-          <el-button
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open" :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
+    <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open"
+      :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col v-show="title !== '复制'" :span="24">
@@ -105,14 +84,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="form.ConfigType == 'M' ? title !== '复制' ? '选择父节点' : '复制到' : '操作名称'">
-                <treeselect
+              <treeselect :disabled="form.ConfigType === 'C'" v-model="form.ParentId" :options="menuOptions"
-                  :disabled="form.ConfigType === 'C'"
+                :normalizer="normalizer" :show-count="true" placeholder="选择上级操作" />
-                  v-model="form.ParentId"
-                  :options="menuOptions"
-                  :normalizer="normalizer"
-                  :show-count="true"
-                  placeholder="选择上级操作"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -157,30 +130,36 @@
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="功能模块" prop="menuType">
               <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeModule">
-                  <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="操作类型" prop="menuType">
               <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="对象类型" prop="menuType">
-                <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small" @change="changeDescription">
+              <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small"
+                @change="changeDescription">
                 <template v-for="item of dict.type.ObjectType">
-                    <el-option :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup"
+                    :value="item.value" :label="item.raw.ValueCN" />
                 </template>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="数据类型" prop="menuType">
-                <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small" @change="changeDescription">
+              <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small"
-                  <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                @change="changeDescription">
+                <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -189,11 +168,7 @@
               <span slot="label">
                 是否电签
               </span>
-                <el-switch
+              <el-switch v-model="form.IsHaveSign" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsHaveSign"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -201,11 +176,7 @@
               <span slot="label">
                 是否有原因
               </span>
-                <el-switch
+              <el-switch v-model="form.IsHaveReason" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsHaveReason"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
@@ -225,11 +196,7 @@
               <span slot="label">
                 依赖父数据
               </span>
-                <el-switch
+              <el-switch v-model="form.IsShowByTrialConfig" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsShowByTrialConfig"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.IsShowByTrialConfig" :span="12">
@@ -244,9 +211,11 @@
             <el-row style="background: #f8f8f8;padding: 0 20px;border-radius: 10px;">
               <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
                 <el-form-item label="前端展示类型">
-                    <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;" @change="(v) => {if (v === 'Table'){rowDrop2()}}">
+                  <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;"
+                    @change="(v) => { if (v === 'Table') { rowDrop2() } }">
                     <el-radio :label="''">字符串</el-radio>
-                      <el-radio :label="item.value" v-for="item in $d.AuditDataType" :key="item.id">{{item.label}}</el-radio>
+                    <el-radio :label="item.value" v-for="item in $d.AuditDataType" :key="item.id">{{ item.label
+                    }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -265,26 +234,27 @@
                       <span slot="label">
                         是否有参数
                       </span>
-                        <el-switch
+                      <el-switch v-model="form.UrlConfig.IsHaveParameters">
-                          v-model="form.UrlConfig.IsHaveParameters"
-                        >
                       </el-switch>
                     </el-form-item>
                   </el-col>
-                    <el-col :span="4" v-if="form.UrlConfig.IsHaveParameters" style="display: flex;align-items: center;justify-content: flex-end;">
+                  <el-col :span="4" v-if="form.UrlConfig.IsHaveParameters"
+                    style="display: flex;align-items: center;justify-content: flex-end;">
                     <el-button type="primary" size="mini" style="position: relative;top: 5px;" @click="addParameter">
                       增加参数
                     </el-button>
                   </el-col>
                 </el-row>
                 <template v-for="(item, index) of form.UrlConfig ? form.UrlConfig.ParameterList : []">
-                    <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters"  :key="`Router${index}`">
+                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters"
+                    :key="`Router${index}`">
                     <el-col :span="10">
                       <el-form-item>
                         <span slot="label">
                           参数名{{ index + 1 }}
                         </span>
-                          <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName" placeholder="参数名" />
+                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName"
+                          placeholder="参数名" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
@@ -292,215 +262,127 @@
                         <span slot="label">
                           参数值{{ index + 1 }}
                         </span>
-                          <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
+                        <el-input style="width: 150px;"
+                          v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                        <el-button
+                      <el-button size="mini" type="text" icon="el-icon-delete"
-                          size="mini"
+                        @click="handleParameterListDelete(index)">删除</el-button>
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleParameterListDelete(index)"
-                        >删除</el-button>
                     </el-col>
                   </el-row>
                 </template>
 
               </el-col>
-                <el-button v-show="form.DataType === 'Table'" type="primary" size="mini" style="position: relative;top: -15px" @click="addCol">
+              <el-button v-show="form.DataType === 'Table'" type="primary" size="mini"
+                style="position: relative;top: -15px" @click="addCol">
                 增加列
               </el-button>
               <el-row v-show="form.DataType === 'Table'" v-if="rowDrop2TableIsShow">
-                  <el-table
+                <el-table :data="form.TableConfigList" stripe height="280">
-                    :data="form.TableConfigList"
+                  <el-table-column prop="IsList" min-width="120" label="是否是数组" show-overflow-tooltip>
-                    stripe
-                    height="280"
-                  >
-                    <el-table-column
-                      prop="IsList"
-                      min-width="120"
-                      label="是否是数组"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsList">
-                          v-model="scope.row.IsList"
-                          >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="ListName" min-width="120" label="数组" show-overflow-tooltip>
-                      prop="ListName"
-                      min-width="120"
-                      label="数组"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
                       <el-input :disabled="!scope.row.IsList" v-model="scope.row.ListName" placeholder="数组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="IsFixedColumn" min-width="140" label="是否固定列名" show-overflow-tooltip>
-                      prop="IsFixedColumn"
-                      min-width="140"
-                      label="是否固定列名"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsFixedColumn">
-                          v-model="scope.row.IsFixedColumn"
-                        >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="FixedColumnName" min-width="120" label="固定列名" show-overflow-tooltip>
-                      prop="FixedColumnName"
-                      min-width="120"
-                      label="固定列名"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName" placeholder="固定列名"/>
+                      <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName"
+                        placeholder="固定列名" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="FixedColumnEnName" min-width="120" label="固定列名EN" show-overflow-tooltip>
-                      prop="FixedColumnEnName"
-                      min-width="120"
-                      label="固定列名EN"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName" placeholder="固定列名EN"/>
+                      <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName"
+                        placeholder="固定列名EN" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="ColumnName" min-width="120" label="列字段名" show-overflow-tooltip>
-                      prop="ColumnName"
-                      min-width="120"
-                      label="列字段名"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
                       <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnName" placeholder="列字段名" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="ColumnEnName" min-width="120" label="列字段名En" show-overflow-tooltip>
-                      prop="ColumnEnName"
-                      min-width="120"
-                      label="列字段名En"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName" placeholder="列字段名En"/>
+                      <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName"
+                        placeholder="列字段名En" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="ColumnValue" min-width="120" label="列显示值" show-overflow-tooltip>
-                      prop="ColumnValue"
-                      min-width="120"
-                      label="列显示值"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
                       <el-input v-model="scope.row.ColumnValue" placeholder="列显示值" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="IsMerge" min-width="80" label="是否合并" show-overflow-tooltip>
-                      prop="IsMerge"
-                      min-width="80"
-                      label="是否合并"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsMerge">
-                          v-model="scope.row.IsMerge"
-                        >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="MergeColumnName" min-width="120" label="合并组" show-overflow-tooltip>
-                      prop="MergeColumnName"
-                      min-width="120"
-                      label="合并组"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
                       <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnName" placeholder="合并组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="MergeColumnEnName" min-width="120" label="合并组EN" show-overflow-tooltip>
-                      prop="MergeColumnEnName"
-                      min-width="120"
-                      label="合并组EN"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName" placeholder="合并组EN"/>
+                      <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName"
+                        placeholder="合并组EN" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="IsPicture" min-width="120" label="是否图片" show-overflow-tooltip>
-                      prop="IsPicture"
-                      min-width="120"
-                      label="是否图片"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsPicture">
-                          v-model="scope.row.IsPicture"
-                        >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="IsDynamicTranslate" min-width="140" label="是否动态翻译" show-overflow-tooltip>
-                      prop="IsDynamicTranslate"
-                      min-width="140"
-                      label="是否动态翻译"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsDynamicTranslate">
-                          v-model="scope.row.IsDynamicTranslate"
-                        >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="IsNeedTransalate" min-width="120" label="是否翻译" show-overflow-tooltip>
-                      prop="IsNeedTransalate"
-                      min-width="120"
-                      label="是否翻译"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-switch
+                      <el-switch v-model="scope.row.IsNeedTransalate">
-                          v-model="scope.row.IsNeedTransalate"
-                        >
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="TranslateDictionaryName" min-width="120" label="翻译字典" show-overflow-tooltip>
-                      prop="TranslateDictionaryName"
-                      min-width="120"
-                      label="翻译字典"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsNeedTransalate" v-model="scope.row.TranslateDictionaryName" placeholder="合并组"/>
+                      <el-input :disabled="!scope.row.IsNeedTransalate" v-model="scope.row.TranslateDictionaryName"
+                        placeholder="合并组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
+                  <el-table-column prop="MergeColumnName" min-width="80" label="操作" show-overflow-tooltip>
-                      prop="MergeColumnName"
-                      min-width="80"
-                      label="操作"
-                      show-overflow-tooltip
-                    >
                     <template slot-scope="scope">
-                        <el-button
+                      <el-button size="mini" type="text" icon="el-icon-delete"
-                          size="mini"
+                        @click="handleTableConfigListDelete(scope.row, scope.$index)">删除</el-button>
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleTableConfigListDelete(scope.row, scope.$index)"
-                        >删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
               </el-row>
+              <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === ''" :span="12">
+                <el-form-item>
+                  <span slot="label">
+                    是否修改前展示
+                  </span>
+                  <el-switch v-model="form.IsBeforeModifyView" :active-value="true" :inactive-value="false" />
+                </el-form-item>
+              </el-col>
+
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                 <el-form-item>
                   <span slot="label">
@@ -517,7 +399,9 @@
                   <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
                 </el-form-item>
               </el-col>
-                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && (form.DataType === 'Array' || form.DataType === 'ArrayImage')" :span="12">
+              <el-col
+                v-show="form.ConfigType === 'C' && title !== '复制' && (form.DataType === 'Array' || form.DataType === 'ArrayImage')"
+                :span="12">
                 <el-form-item>
                   <span slot="label">
                     子数据Value
@@ -542,31 +426,23 @@
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                 <el-form-item label="字典表名">
                   <!-- <el-input v-model="form.DictionaryCode" placeholder="请输入字典表名" /> -->
-                    <el-autocomplete
+                  <el-autocomplete clearable class="inline-input" v-model="form.DictionaryCode"
-                      clearable 
+                    :fetch-suggestions="querySearch" placeholder="请输入字典表名"></el-autocomplete>
-                      class="inline-input"
-                      v-model="form.DictionaryCode"
-                      :fetch-suggestions="querySearch"
-                      placeholder="请输入字典表名"
-                    ></el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                 <el-form-item label="翻译字段">
                   <!-- <el-input v-model="form.DictionaryType" placeholder="请输入翻译字段" /> -->
                   <el-select v-model="form.DictionaryType" clearable placeholder="请选择翻译字段">
-                      <el-option
+                    <el-option v-for="item in $d.DictionaryType" :key="item.id" :label="item.label" :value="item.label">
-                        v-for="item in $d.DictionaryType"
-                        :key="item.id"
-                        :label="item.label"
-                        :value="item.label">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Date'" :span="24">
                 <el-form-item label="时间格式化">
-                    <el-select v-model="form.DateType" placeholder="时间格式化" clearable size="small" @change="changeDescription">
+                  <el-select v-model="form.DateType" placeholder="时间格式化" clearable size="small"
+                    @change="changeDescription">
                     <el-option value="Date" label="日期" />
                     <el-option value="DateTime" label="日期时间" />
                   </el-select>
@@ -604,11 +480,7 @@
               <span slot="label">
                 是否启用
               </span>
-                <el-switch
+              <el-switch v-model="form.IsEnable" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsEnable"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="title !== '复制'" :span="24">
@@ -616,11 +488,7 @@
               <span slot="label">
                 是否默认
               </span>
-                <el-switch
+              <el-switch v-model="form.IsDefaultChoice" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsDefaultChoice"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <!--分割线-->
@@ -632,11 +500,7 @@
               <span slot="label">
                 是否核对
               </span>
-                <el-switch
+              <el-switch v-model="form.IsJoinPlan" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsJoinPlan"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -644,11 +508,7 @@
               <span slot="label">
                 是否记录
               </span>
-                <el-switch
+              <el-switch v-model="form.IsFinish" :active-value="true" :inactive-value="false" />
-                  v-model="form.IsFinish"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
             </el-form-item>
           </el-col>
         </el-row>
@@ -659,48 +519,38 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-drawer
+    <el-drawer :title="drawer_cfg.title" :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
-      :title="drawer_cfg.title"
-      :visible.sync="drawer_cfg.drawerChild"
-      direction="rtl"
-      size="80%"
-    >
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
-          <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
+          <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable
+            size="small">
             <template v-for="item of list">
-                <el-option :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+              <el-option :key="item.Id"
+                v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId"
+                :value="item.Id" :label="item.DescriptionCN" />
             </template>
           </el-select>
-          <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 10px"
-          <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
+            @click="handleOverCope(selectRow)">完全拷贝</el-button>
+          <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable
+            size="small">
             <template v-for="item of list">
-              <el-option  :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+              <el-option :key="item.Id"
+                v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId"
+                :value="item.Id" :label="item.DescriptionCN" />
             </template>
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>
         </div>
         <div style="flex: 1">
-          <el-table
+          <el-table v-if="tableShow" v-adaptive="{ bottomOffset: 0 }" v-loading="loading" :data="childrenList"
-            v-if="tableShow"
+            :row-key="selectRow ? selectRow.Id : '1'" class="singleTable" height="100">
-            v-adaptive="{bottomOffset:0}"
-            v-loading="loading"
-            :data="childrenList"
-            :row-key="selectRow ? selectRow.Id : '1'"
-            class="singleTable"
-            height="100"
-          >
             <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="CodeEn" label="字段名英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
-            <el-table-column
+            <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
-              prop="Sort"
-              label="显示顺序"
-              min-width="80"
-              show-overflow-tooltip
-            />
             <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
@@ -730,37 +580,16 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column prop="TrialConfigRelyFieldName" label="依赖字段" min-width="120px" :show-overflow-tooltip="true" />
+            <el-table-column prop="TrialConfigRelyFieldName" label="依赖字段" min-width="120px"
-            <el-table-column label="操作" align="center" min-width="260" class-name="small-padding fixed-width" fixed="right">
+              :show-overflow-tooltip="true" />
+            <el-table-column label="操作" align="center" min-width="260" class-name="small-padding fixed-width"
+              fixed="right">
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" @click="handleUpMove(scope.row, true, true)">上移</el-button>
-                  size="mini"
+                <el-button size="mini" type="text" @click="handleUpMove(scope.row, true, false)">下移</el-button>
-                  type="text"
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopyData(scope.row)">复制</el-button>
-                  @click="handleUpMove(scope.row, true, true)"
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
-                >上移</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="handleUpMove(scope.row, true, false)"
-                >下移</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleCopyData(scope.row)"
-                >复制</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                >删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1189,6 +1018,7 @@ export default {
         IsSpecialType: false,
         DataType: '',
         ChildDataLabel: null,
+        IsBeforeModifyView: false,
         ChildDataEnLabel: null,
         ChildDataValue: null,
         DateType: null,
@@ -1319,6 +1149,7 @@ export default {
 .vue-treeselect div {
   line-height: 40px;
 }
+
 #check_config .el-dialog__body {
   padding: 0 20px;
 }

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -1191,7 +1191,7 @@ export default {
           } else {
             item = {
               newValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--',
-              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--'
+              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) && v.IsBeforeModifyView ? row[v.Code] : '--') : '--'
             }
           }
         }