更新打包

src/components/Tinymce/components/EditorImage.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="upload-container">
-    <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
+    <el-button
+      :style="{ background: color, borderColor: color }"
+      icon="el-icon-upload"
+      size="mini"
+      type="primary"
+      @click="dialogVisible = true"
+    >
       upload
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
@@ -33,11 +39,11 @@
 // import { getToken } from 'api/qiniu'
 
 export default {
-  name: 'EditorSlideUpload',
+  name: "EditorSlideUpload",
   props: {
     color: {
       type: String,
-      default: '#1890ff'
+      default: "#1890ff"
     }
   },
   data() {
@@ -45,60 +51,69 @@ export default {
       dialogVisible: false,
       listObj: {},
       fileList: []
-    }
+    };
   },
   methods: {
     checkAllSuccess() {
-      return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
+      return Object.keys(this.listObj).every(
+        item => this.listObj[item].hasSuccess
+      );
     },
     handleSubmit() {
-      const arr = Object.keys(this.listObj).map(v => this.listObj[v])
+      const arr = Object.keys(this.listObj).map(v => this.listObj[v]);
       if (!this.checkAllSuccess()) {
-        this.$message('Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!')
-        return
+        this.$message(
+          "Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!"
+        );
+        return;
       }
-      this.$emit('successCBK', arr)
-      this.listObj = {}
-      this.fileList = []
-      this.dialogVisible = false
+      this.$emit("successCBK", arr);
+      this.listObj = {};
+      this.fileList = [];
+      this.dialogVisible = false;
     },
     handleSuccess(response, file) {
-      const uid = file.uid
-      const objKeyArr = Object.keys(this.listObj)
+      const uid = file.uid;
+      const objKeyArr = Object.keys(this.listObj);
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          this.listObj[objKeyArr[i]].url = response.files.file
-          this.listObj[objKeyArr[i]].hasSuccess = true
-          return
+          this.listObj[objKeyArr[i]].url = response.files.file;
+          this.listObj[objKeyArr[i]].hasSuccess = true;
+          return;
         }
       }
     },
     handleRemove(file) {
-      const uid = file.uid
-      const objKeyArr = Object.keys(this.listObj)
+      const uid = file.uid;
+      const objKeyArr = Object.keys(this.listObj);
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          delete this.listObj[objKeyArr[i]]
-          return
+          delete this.listObj[objKeyArr[i]];
+          return;
         }
       }
     },
     beforeUpload(file) {
-      const _self = this
-      const _URL = window.URL || window.webkitURL
-      const fileName = file.uid
-      this.listObj[fileName] = {}
+      const _self = this;
+      const _URL = window.URL || window.webkitURL;
+      const fileName = file.uid;
+      this.listObj[fileName] = {};
       return new Promise((resolve, reject) => {
-        const img = new Image()
-        img.src = _URL.createObjectURL(file)
+        const img = new Image();
+        img.src = _URL.createObjectURL(file);
         img.onload = function() {
-          _self.listObj[fileName] = { hasSuccess: false, uid: file.uid, width: this.width, height: this.height }
-        }
-        resolve(true)
-      })
+          _self.listObj[fileName] = {
+            hasSuccess: false,
+            uid: file.uid,
+            width: this.width,
+            height: this.height
+          };
+        };
+        resolve(true);
+      });
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>

src/components/VueFormMaking/components/Upload/index.vue

@@ -110,8 +110,8 @@ import Draggable from "vuedraggable";
 import * as qiniu from "qiniu-js";
 require("viewerjs/dist/viewer.css");
 
-// import VueI18n from 'vue-i18n'
-// Vue.use(VueI18n)
+import VueI18n from "vue-i18n";
+Vue.use(VueI18n);
 export default {
   components: {
     Draggable
@@ -421,7 +421,10 @@ export default {
       this.$refs.uploadInput.click();
     },
     handleMeitu(key) {
-      this.$emit("on-meitu", this.fileList.findIndex(item => item.key === key));
+      this.$emit(
+        "on-meitu",
+        this.fileList.findIndex(item => item.key === key)
+      );
     },
     handleAdd() {
       if (!this.disabled) {

src/views/process/list/components/search/index.vue

@@ -153,6 +153,11 @@ export default {
     if (this.listQuery.startTime && this.listQuery.endTime) {
       this.timeValue = [this.listQuery.startTime, this.listQuery.endTime];
     }
+    if (this.listQuery.processor && this.listQuery.processorName) {
+      this.listQuery.processor = Number(this.listQuery.processor);
+      this.remoteUserList(this.listQuery.processorName);
+    }
+    console.log(this.listQuery);
   },
   methods: {
     getList() {
@@ -167,6 +172,17 @@ export default {
         this.listQuery.startTime = parseTime(this.timeValue[0]);
         this.listQuery.endTime = parseTime(this.timeValue[1]);
       }
+      // 处理显示用户名
+      if (this.listQuery.processor) {
+        this.UserOptions.forEach(item => {
+          if (this.listQuery.processor == item.userId) {
+            this.listQuery.processorName = item.nickName;
+          }
+        });
+      } else {
+        this.listQuery.processorName = "";
+      }
+      console.log(this.listQuery, "listQuery showInfo");
       this.$emit("handleSearch", this.listQuery);
     },
     remoteUserList(query) {

src/views/process/list/create.vue

@@ -210,8 +210,8 @@ export default {
     },
     getProcessNodeList() {
       const processId = this.$route.query.processId;
-      if(!processId) {
-        return
+      if (!processId) {
+        return;
       }
       processStructure({
         processId: this.$route.query.processId,

src/views/process/list/handle.vue

@@ -346,7 +346,7 @@
               :class="activeIndex >= index ? 'large-icon' : ''"
               size="large"
             >
-            <!-- :color="formatIcon(item, index, 'color')" -->
+              <!-- :color="formatIcon(item, index, 'color')" -->
               <div class="step-title">
                 {{ item.state || item.label }}
                 <span class="apply-time">
@@ -396,7 +396,11 @@
                   {{ item.processor
                   }}{{ item.circulation ? `（${item.circulation}）` : null }}
                 </p>
-                <p class="remarks" v-if="item.remarks" v-html="dataModelFormatBr(item.remarks)"></p>
+                <p
+                  class="remarks"
+                  v-if="item.remarks"
+                  v-html="dataModelFormatBr(item.remarks)"
+                ></p>
 
                 <!-- 判断是否有添加图片 -->
                 <div
@@ -415,7 +419,6 @@
                     :preview-src-list="item.fileUrl.image"
                   >
                   </el-image>
-
                 </div>
                 <!-- 判断是否有添加的文件 -->
                 <div
@@ -432,7 +435,9 @@
                     class="fileUploader"
                   >
                     <i style="color: #909399;" class="el-icon-document" />
-                    <span style="margin-right: 10px;">{{ uploadUrlItem.name || uploadUrlItem.url }}</span>
+                    <span style="margin-right: 10px;">{{
+                      uploadUrlItem.name || uploadUrlItem.url
+                    }}</span>
                     <el-button
                       round
                       size="mini"
@@ -460,12 +465,12 @@
                 <!-- 已抄送1人 -->
                 <div class="ccUsers" @click="onCCChange(item)">
                   <span>已抄送{{ item.cc_user.length }}人</span>
-                  <van-icon
+                  <el-icon
                     v-show="!item.ccStatus"
                     style="color: #CCCCCC"
                     name="arrow-down"
                   />
-                  <van-icon
+                  <el-icon
                     v-show="item.ccStatus"
                     style="color: #CCCCCC"
                     name="arrow-up"
@@ -525,6 +530,7 @@ export default {
     const query = this.$route.query;
     return {
       workOrderId: query.workOrderId,
+      processId: query.processId,
       isLoadingStatus: true,
       currentNode: {
         hideTpls: null,
@@ -587,7 +593,7 @@ export default {
   computed: {
     ...mapGetters(["userId"])
   },
-  async created() {
+  async mounted() {
     await this.getUserInfo();
     await this.getAllOrgan();
     await this.getProcessNodeList();
@@ -721,8 +727,8 @@ export default {
     },
     async getProcessNodeList() {
       await processStructure({
-        processId: this.$route.query.processId,
-        workOrderId: this.$route.query.workOrderId,
+        processId: this.processId,
+        workOrderId: this.workOrderId,
         userId: this.userIds
       }).then(response => {
         let tempData = response.data.tpls;
@@ -1228,26 +1234,26 @@ export default {
       });
     },
     dataModelFormatBr(str) {
-      return str ? str.replace(/\n/g, "<br />") : str
+      return str ? str.replace(/\n/g, "<br />") : str;
     },
     formatIcon(item, index, type) {
       // 格式化ICON
       // console.log(item, index)
       // console.log(this.activeIndex)
-      if(this.activeIndex >= index) {
-        if(item.circulation == '转交') {
-          return 'icon-transfer'
-        } else if(this.activeIndex == index) {
-          return 'icon-wait'
-        } else if(item.status == 0) {
-          return 'el-icon-error'
+      if (this.activeIndex >= index) {
+        if (item.circulation == "转交") {
+          return "icon-transfer";
+        } else if (this.activeIndex == index) {
+          return "icon-wait";
+        } else if (item.status == 0) {
+          return "el-icon-error";
         } else {
-          return 'el-icon-success'
+          return "el-icon-success";
         }
       }
 
-      // #fd803a 
-      return ''
+      // #fd803a
+      return "";
     }
   }
 };
@@ -1284,7 +1290,7 @@ export default {
   background: #f5f5f5;
   padding: 8px;
   color: #323233;
-  border-radius: 6px; 
+  border-radius: 6px;
   line-height: 1.5;
 }
 .imgUploader {
@@ -1305,7 +1311,8 @@ export default {
   border-radius: 4px;
 }
 
-/deep/.icon-transfer, /deep/.icon-wait {
+/deep/.icon-transfer,
+/deep/.icon-wait {
   display: flex;
   align-items: center;
   box-sizing: content-box;
@@ -1313,22 +1320,22 @@ export default {
   padding: 2px 0;
   height: 23px;
   &::before {
-    content: ' ';
+    content: " ";
     display: inline-block;
     width: 23px;
     height: 23px;
-    background: url('../../../assets/system-transfer.png') no-repeat center;
+    background: url("../../../assets/system-transfer.png") no-repeat center;
     background-size: contain;
   }
 }
 
 /deep/.icon-wait {
   &::before {
-    content: ' ';
+    content: " ";
     display: inline-block;
     width: 23px;
     height: 23px;
-    background: url('../../../assets/system-wait.png') no-repeat center;
+    background: url("../../../assets/system-wait.png") no-repeat center;
     background-size: contain;
   }
 }
@@ -1342,7 +1349,8 @@ export default {
     background-color: transparent;
   }
 
-  /deep/.el-icon-success, /deep/.el-icon-error {
+  /deep/.el-icon-success,
+  /deep/.el-icon-error {
     font-size: 24px;
     color: #22b4a9;
     background-color: #fff;
@@ -1350,7 +1358,7 @@ export default {
   }
 
   /deep/.el-icon-error {
-    color: #ff2e2e
+    color: #ff2e2e;
   }
 }
 </style>