瀏覽代碼

fix: 流程附件加进度条等

liuc 4 月之前
父節點
當前提交
b0940534ea

+ 1 - 1
src/views/flow/stFormDesign/packages/PopUpQuery/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-form-item
+    <a-form-item :class="{ 'red-label': record?.options?.requiredFirst ||record?.rules?.find(f=>f.required)}"
         :label-col="
         formConfig.layout === 'horizontal'
           ? formConfig.labelLayout === 'flex'

+ 3 - 3
src/views/flow/stFormDesign/packages/StFormDesign/module/jsModal.vue

@@ -455,9 +455,9 @@ const descItems = [
       "label": 'taskid',
       "value": '任务id',
     }, {
-        "label": 'itemType',
-        "value": '节点类型(1填写,2审核,3传阅)',
-      },
+      "label": 'itemType',
+      "value": '节点类型(1填写,2审核,3传阅)',
+    },
     ]
   },
   {

+ 3 - 12
src/views/flow/stFormDesign/packages/UploadFile/uploadFile.vue

@@ -9,7 +9,6 @@
         :action="getAction"
         :multiple="record.options.multiple"
         :fileList="fileList"
-        :progress="progress"
         @preview="handlePreview"
         @change="handleChange"
         :beforeUpload="beforeUpload"
@@ -19,6 +18,9 @@
         <div style="display: flex; justify-content: space-between; align-items: center">
           <a :style="file.status === 'error' ? 'color: red' : ''" @click="handlePreview(file)">{{ file.name }}</a>
           <a-space style="margin-right: 10px">
+            <span style="color:#1677ff" v-show="file.originFileObj=='[object File]'">
+            上传进度:{{file.percent.toFixed(2)}}%
+            </span>
             <a style="font-size:16px;margin-right: 10px" href="javascript:;" @click="handlePreview(file)">
               <EyeOutlined/>
             </a>
@@ -130,17 +132,6 @@ export default {
         this.fileList = this.value;
       }
     },
-    progress () {
-      return {
-        strokeColor: {
-          '0%': '#108ee9',
-          '100%': '#87d068',
-        },
-        strokeWidth: 3,
-        format: percent => `${parseFloat(percent.toFixed(2))}%`,
-        class: 'test',
-      }
-    },
     handleSelectChange() {
       setTimeout(() => {
         this.$emit('update:value', this.fileList); //主表,直接更新value

+ 21 - 3
src/views/flow/stFormWork/formWork.vue

@@ -401,7 +401,7 @@ onBeforeMount(() => {
   if (route.query.isMobile) {
     isMobile.value = route.query.isMobile
   }
-  })
+})
 onMounted(async () => {
   window.hiwebSocket = {
     hasIo: function hasIo(t) {
@@ -1188,6 +1188,11 @@ const checkAndInitData = async () => {
 
                   if (singleData[singleKey] == find[singleKey]) {
                     delete singleData[singleKey];
+                  } else {
+                    if (singleData[singleKey] == undefined) {
+                      //处理人员删不了的问题
+                      singleData[singleKey] = null;
+                    }
                   }
                 }
               });
@@ -1214,17 +1219,30 @@ const checkAndInitData = async () => {
         if (typeof saveData[key] != 'string') {
           saveData[key] = JSON.stringify(saveData[key]);
         }
-      }
-      if (value.type === 'IMAGE') {
+      } else if (value.type === 'IMAGE') {
+        const images = saveData[key];
+        if (images && images.length > 0) {
+          for (let i = 0; i < images.length; i++) {
+            images[i].thumbUrl = images[i]?.response?.data?.fileUrl;
+          }
+        }
+      } else if (value.type === 'IMAGE') {
         const images = saveData[key];
         if (images && images.length > 0) {
           for (let i = 0; i < images.length; i++) {
             images[i].thumbUrl = images[i]?.response?.data?.fileUrl;
           }
         }
+      } else if (value.type === "SINGLE") {
+
       }
       if (saveData[key] == formLoadTableData.value[key]) {
         delete saveData[key];
+      } else {
+        if (saveData[key] == undefined) {
+          //处理人员删不了的问题
+          saveData[key] = null;
+        }
       }
     }
   });

+ 1 - 1
vite.config.js

@@ -39,7 +39,7 @@ export default {
     port: 8081,
     proxy: {
       '/api': {
-        target: 'http://localhost:6008',
+        target: 'http://localhost:9000',
         // target: 'http://192.168.17.209:2024',
         changeOrigin: true,
         ws: true,