稽查展示新增数组图片分类

src/views/dictionary/checkConfig/index.vue

@@ -171,7 +171,9 @@
             <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-option v-for="item of dict.type.ObjectType" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+                  <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" />
+                  </template>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -275,32 +277,35 @@
                       </el-button>
                     </el-col>
                   </el-row>
-                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :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-form-item>
-                    </el-col>
-                    <el-col :span="10" >
-                      <el-form-item>
-                      <span slot="label">
-                        参数值{{index + 1}}
-                      </span>
-                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleParameterListDelete(index)"
-                      >删除</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-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-form-item>
+                      </el-col>
+                      <el-col :span="10" >
+                        <el-form-item>
+                        <span slot="label">
+                          参数值{{index + 1}}
+                        </span>
+                          <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="4">
+                        <el-button
+                          size="mini"
+                          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">
                   增加列

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

@@ -230,7 +230,7 @@
                     {{ $t('trials:auditRecord:title:viewDetail') }}
                   </a>
                   <viewer
-                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'"
+                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage') && scope.row.oldValue && scope.row.oldValue !== '--'"
                     :ref="`${scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue}_modelCfg`"
                     :images="imagesList">
                     <!-- 查看图片 -->
@@ -238,8 +238,8 @@
                       $t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
                         instanceof Array ? `(${scope.row.oldValue.length})` : '' }}</span>
                     <template v-for="item of scope.row.oldValue">
-                      <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item"
-                        v-show="false" crossorigin="anonymous" alt="">
+                      <img v-if="scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage'" :key="item"
+                        :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                     </template>
                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue"
                       v-show="false" crossorigin="anonymous" alt="">
@@ -268,7 +268,7 @@
                     {{ $t('trials:auditRecord:title:viewDetail') }}
                   </a>
                   <viewer
-                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'"
+                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage') && scope.row.newValue && scope.row.newValue !== '--'"
                     :ref="`${scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue}_modelcfg`"
                     :images="imagesList">
                     <!-- 查看图片 -->
@@ -276,8 +276,8 @@
                       $t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
                         instanceof Array ? `(${scope.row.newValue.length})` : '' }}</span>
                     <template v-for="item of scope.row.newValue">
-                      <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item"
-                        v-show="false" crossorigin="anonymous" alt="">
+                      <img v-if="scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage'" :key="item"
+                        :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                     </template>
                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue"
                       v-show="false" crossorigin="anonymous" alt="">
@@ -476,7 +476,7 @@
                     {{ $t('trials:auditRecord:title:viewDetail') }}
                   </a>
                   <viewer
-                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'"
+                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage') && scope.row.oldValue && scope.row.oldValue !== '--'"
                     :ref="scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue"
                     :images="imagesList">
                     <!-- 查看图片 -->
@@ -484,8 +484,8 @@
                       $t('trials:auditRecord:title:viewImage') }}{{ scope.row.oldValue
                         instanceof Array ? `(${scope.row.oldValue.length})` : '' }}</span>
                     <template v-for="item of scope.row.oldValue">
-                      <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item"
-                        v-show="false" crossorigin="anonymous" alt="">
+                      <img v-if="scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage'" :key="item"
+                        :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                     </template>
                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue"
                       v-show="false" crossorigin="anonymous" alt="">
@@ -519,7 +519,7 @@
                     {{ $t('trials:auditRecord:title:viewDetail') }}
                   </a>
                   <viewer
-                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'"
+                    v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage') && scope.row.newValue && scope.row.newValue !== '--'"
                     :ref="scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue"
                     :images="imagesList">
                     <!-- 查看图片 -->
@@ -527,8 +527,8 @@
                       $t('trials:auditRecord:title:viewImage') }}{{ scope.row.newValue
                         instanceof Array ? `(${scope.row.newValue.length})` : '' }}</span>
                     <template v-for="item of scope.row.newValue">
-                      <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item"
-                        v-show="false" crossorigin="anonymous" alt="">
+                      <img v-if="scope.row.DataType === 'ImageList' || scope.row.DataType === 'ArrayImage'" :key="item"
+                        :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                     </template>
                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue"
                       v-show="false" crossorigin="anonymous" alt="">
@@ -863,6 +863,49 @@ export default {
           }
           return
         }
+        // 数组图片
+        if (v.DataType === 'ArrayImage') {
+          let objArr = [], upObjArr = []
+          if (obj[v.Code] && obj[v.Code].length > 0) {
+            obj[v.Code].forEach(item => {
+              objArr.push(item[v.ChildDataValue])
+            })
+          }
+          if (upObj[v.Code] && upObj[v.Code].length > 0) {
+            upObj[v.Code].forEach(item => {
+              upObjArr.push(item[v.ChildDataValue])
+            })
+          }
+          if (obj[v.Code]) {
+            // obj[v.Code] = obj[v.Code].filter(s => s && s.trim())
+            if (row.OptType === 'Add' || row.OptType === 'Init') {
+              item = {
+                key: v.Code,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+                newValue: objArr.length > 0 ? objArr : '--',
+                oldValue: ''
+              }
+            } else if (row.OptType === 'Delete') {
+              item = {
+                key: v.Code,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+                oldValue: objArr.length > 0 ? objArr : '--',
+                newValue: '--'
+              }
+            } else {
+              item = {
+                key: v.Code,
+                Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value,
+                newValue: objArr.length > 0 ? objArr : '--',
+                oldValue: upObj.length > 0 ? upObj : '--',
+              }
+            }
+            item.DataType = v.DataType
+            this[auditData].push(item)
+          }
+          return
+        }
+        // 拼接字符
         if (v.DataType === 'CombiningString') {
           let arr = this.extractBraces(v.Code)
           let o = null, up = null;