优化修改

src/views/dataAdmin/assembly/MapSourceModal.vue

@@ -1,6 +1,7 @@
 
 <template>
-  <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" :title="getTitle" @ok="handleSubmit">
+  <BasicModal width="1200px" v-bind="$attrs" @register="registerModal" @cancel="handleCancel" :title="getTitle"
+    @ok="handleSubmit">
     <div style="height: 60vh" class="res-form-container">
       <a-tabs v-model:activeKey="activeKey" class="res-a-tabs">
         <a-tab-pane key="1" tab="组件信息">
@@ -85,7 +86,15 @@ export default defineComponent({
     }
 
     onMounted(() => getFlow());
+
+    function handleCancel() {
+      formData.value = null;
+      closeModal();
+    }
+
+
     return {
+      handleCancel,
       isView,
       flowCode,
       activeKey,

src/views/dataAdmin/assembly/SourceDetail.vue

@@ -59,14 +59,10 @@
               <a-input v-model:value="formState.crs" :rows="2" :disabled="isView" />
             </a-form-item>
           </a-col>
-          <!-- <a-col :span="9" class="form-col">
-            <a-form-item ref="sourcetable" label="预览图名称" name="sourcetable" class="label-form-item">
-              <a-input v-model:value="formState.publiccurl" />
-            </a-form-item>
-          </a-col> -->
           <a-col :span="8" class="form-col">
             <a-form-item ref="thumbnail" label="缩略图" name="thumbnail" class="label-form-item">
-              <a-upload :custom-request="customUpload" v-model:file-list="fileList" :disabled="isViewImg">
+              <a-upload :beforeUpload="beforeUploadImg" :custom-request="customUpload" v-model:file-list="fileList"
+                :disabled="isViewImg">
                 <a-button style="background-color: #0671dd; color: #fff; border-radius: 4px" :disabled="isView">
                   <upload-outlined></upload-outlined>
                   文件上传
@@ -75,9 +71,9 @@
             </a-form-item>
           </a-col>
           <a-col :span="16" class="form-col">
-            <div class="wrapperImg">
+            <div class="wrapperImg" v-if="formState.mapingurl">
               <img v-if="formState.mapingurl" :id="formState.mapingurl" :src="getImg(formState.mapingurl)" alt="图片">
-              <p v-else>无预览图</p>
+              <!-- <p v-else>无预览图</p> -->
             </div>
           </a-col>
         </a-row>
@@ -90,7 +86,6 @@ import {
   defineComponent,
   ref,
   toRefs,
-  unref,
   reactive,
   UnwrapRef,
   onMounted,
@@ -106,6 +101,7 @@ import { useI18n } from '/@/hooks/web/useI18n';
 import Moment from 'moment';
 import { insertService, updateService, update, getImgUrl } from '/@/api/dataAdmin/assembly';
 import { session } from '/@/utils/Memory.js';
+import { message } from 'ant-design-vue';
 
 const props = {
   formData: { type: Object, default: ref(null) },
@@ -335,14 +331,21 @@ export default defineComponent({
       resetForm();
     });
 
+    function beforeUploadImg() {
+      console.log("1111111")
+    }
+
     function customUpload({ file, onSuccess, onError }) {
+      if (fileList.value.length) {
+        onError()
+        return message.error('只能上传一个文件,请先删除之前的文件！')
+      }
       const formData = new FormData();
       formData.append('file', file);
       update(formData, session.getItem('sysFild').dirId).then(r => {
         if (r && r.resp_code == 0 && r.resp_msg == "OK") {
           formState.mapingurl = `${r.datas.id},${r.datas.dirId}`;
-          fileList.value.length = 1;
-          isViewImg.value = true;
+          // isViewImg.value = true;
           onSuccess()
         } else {
           onError()
@@ -358,6 +361,7 @@ export default defineComponent({
       }
     }
     return {
+      beforeUploadImg,
       getImg,
       fileList,
       isViewImg,

src/views/dataAdmin/assembly/flowStep/index.vue

@@ -200,6 +200,9 @@ export default defineComponent({
           if (res.resp_code == 0 && res?.datas?.pageData?.length) {
             pageData.value = res.datas.pageData.map((i, index) => {
               if (i.ISPASS != null && i.ISPASS != undefined) {
+                if (!i.NODEDISCRIPTION) {
+                  i.NODEDISCRIPTION = i.CHECKINFO == '起件' ? '提交审核' : i.CHECKINFO == '归档' ? '审核结束' : i.NODEDISCRIPTION;
+                }
                 var type = i.ISPASS == '1' ? '1' : i.ISPASS == '0' ? '3' : '0';
                 data.steps[index].status = type;
                 data.steps[index].handlers.map(j => { j.status = type, i.handler = j.handler });

src/views/dataAdmin/assembly/flowStep/table.data.ts

@@ -29,7 +29,7 @@ export const columns: BasicColumn[] = [
   // },
   {
     title: '处理人',
-    dataIndex: 'handler',
+    dataIndex: 'CHECKUSERNAEM',
     width: 110,
   },
   {

src/views/dataAdmin/dataAdmin/fileResourceUpload/AddMethod.vue

@@ -28,7 +28,7 @@
               </div>
             </template>
             <template #roleSlot="{ model, field }">
-              <a-select mode="multiple" allowClear placeholder="请选择角色" v-model:value="model[field]"
+              <a-select :disabled="isView" mode="multiple" allowClear placeholder="请选择资源标签" v-model:value="model[field]"
                 :options="serviceTags">
               </a-select>
             </template>
@@ -107,7 +107,10 @@ export default defineComponent({
         setFieldsValue(data.record);
       }
       setProps({ disabled: isView.value });
-      if (isUpdate.value || isView.value) formData.value = data.record;
+      if (isUpdate.value || isView.value) {
+        data.record.keywords = data.record.keywords.indexOf('[') > -1 ? JSON.parse(data.record.keywords) : [data.record.keywords];
+        formData.value = data.record;
+      }
     });
     const getTitle = computed(() => {
       if (isUpdate.value && !isView.value) {
@@ -316,6 +319,7 @@ export default defineComponent({
     };
 
     return {
+      isView,
       serviceTags,
       formData,
       createMessage,

src/views/dataAdmin/dataAdmin/flowStep/index.vue

@@ -215,6 +215,9 @@ export default defineComponent({
           if (res.resp_code == 0 && res?.datas?.pageData?.length) {
             pageData.value = res.datas.pageData.map((i, index) => {
               if (i.ISPASS != null && i.ISPASS != undefined) {
+                if (!i.NODEDISCRIPTION) {
+                  i.NODEDISCRIPTION = i.CHECKINFO == '起件' ? '提交审核' : i.CHECKINFO == '归档' ? '审核结束' : i.NODEDISCRIPTION;
+                }
                 var type = i.ISPASS == '1' ? '1' : i.ISPASS == '0' ? '3' : '0';
                 data.steps[index].status = type;
                 data.steps[index].handlers.map(j => { j.status = type, i.handler = j.handler });

src/views/dataAdmin/dataAdmin/flowStep/table.data.ts

@@ -29,7 +29,7 @@ export const columns: BasicColumn[] = [
   // },
   {
     title: '处理人',
-    dataIndex: 'handler',
+    dataIndex: 'CHECKUSERNAEM',
     width: 110,
   },
   {

src/views/dataAdmin/dataAdmin/sceneResourceUpload/AddMethod.vue

@@ -42,8 +42,8 @@
             <template #descinfo>
               <div class="basic-info-title">描述信息</div>
             </template>
-            <template #roleSlot="{ model, field }">
-              <a-select mode="multiple" allowClear placeholder="请选择角色" v-model:value="model[field]"
+            <template #keywords="{ model, field }">
+              <a-select mode="multiple" :disabled="isView" allowClear placeholder="请选择资源标签" v-model:value="model[field]"
                 :options="serviceTags">
               </a-select>
             </template>
@@ -67,6 +67,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, ref, computed, unref, reactive, onMounted } from 'vue';
+import { serviceTags } from '../sysDic';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { accountFormSchema } from './sceneUploadData';
@@ -83,7 +84,6 @@ import FlowStep from '../flowStep/index.vue';
 import { addFileResource } from '../../api/fileUploadApi';
 import { insertService, updateService } from '/@/api/resource/map';
 import { session } from '/@/utils/Memory.js';
-import { serviceTags } from '../sysDic';
 
 export default defineComponent({
   name: 'AccountModal',
@@ -102,7 +102,6 @@ export default defineComponent({
     const roleOptions = ref<TOption[]>([]);
     const isUpdate = ref(true);
     const isView = ref(false);
-
     const rowId = ref('');
     const serviceid = ref('');
     const postData = reactive({});
@@ -142,7 +141,11 @@ export default defineComponent({
         setFieldsValue(data.record);
       }
       setProps({ disabled: isView.value });
-      if (isUpdate.value || isView.value) formData.value = data.record;
+
+      if (isUpdate.value || isView.value) {
+        data.record.keywords = data.record.keywords.indexOf('[') > -1 ? JSON.parse(data.record.keywords) : [data.record.keywords];
+        formData.value = data.record;
+      }
     });
     const getTitle = computed(() => {
       if (isUpdate.value && !isView.value) {
@@ -269,6 +272,7 @@ export default defineComponent({
     function func(row, label) {
       console.log(row, label);
     }
+
     return {
       serviceTags,
       formData,

src/views/dataAdmin/dataAdmin/sceneResourceUpload/sceneUploadData.js

@@ -167,16 +167,7 @@ export const accountFormSchema = [
     required: true,
     component: 'Select',
     colProps: { span: 12 },
-    slot: 'roleSlot',
-    componentProps: {
-      replaceFields: {
-        title: 'label',
-        key: 'value',
-        value: 'value',
-      },
-      maxTagCount: 10,
-      options: serviceTags
-    },
+    slot: 'keywords',
   },
   {
     field: 'description',