Merge branch 'hjw-2023.1.4' into 'master'

Hjw 2023.1.4

See merge request spfm/spfm-market-front!399

src/components/el-form.vue

@@ -12,6 +12,8 @@
       empty-text="暂无数据"
       @cell-click="getRowList"
       :cell-style="columnbackgroundStyle"
+      row-key="id"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
       <!-- 是否多选 -->
       <el-table-column
@@ -118,9 +120,9 @@ export default {
   },
   methods: {
     columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.type == 'default') {
-        if (column.label === '待办事项名称') {
-          return 'color:#0682CD;'
+      if (column.type == "default") {
+        if (column.label === "文件标题") {
+          return "color:#0682CD;";
         }
       }
     },

src/components/workflowBase.vue

@@ -46,7 +46,10 @@
             </div>
             <div class="flex-header-text-tree">
               已选人员
-              <div class="">{{ selectUser }}</div>
+              <!-- <div class="">{{ selectUser }}</div> -->
+              <div class="" v-for="(item, index) in backThree" :key="index">
+                {{ item.loginNameStr }}
+              </div>
             </div>
           </div>
         </div>
@@ -173,12 +176,12 @@ export default {
       };
       if (this.manyPeopleStatus == true) {
         list.procinstid = this.list.processId;
-        if (this.backThree.length <= 1) {
-          this.$message.error("请选择多人");
-          return;
-        } else {
-          list.lastmanList = this.nextDealManList;
-        }
+        // if (this.backThree.length <= 1) {
+        // this.$message.error("请选择多人");
+        // return;
+        // } else {
+        list.lastmanList = this.nextDealManList;
+        // }
         if (this.nodes.currentShape) {
           newlist.resolution = this.nodes.currentShape[0].condition.resolution;
           newlist.approve = this.nodes.currentShape[0].condition.approve;
@@ -691,4 +694,4 @@ export default {
     width: 222px;
   }
 }
-</style>
+</style>

src/components/workflowEntrance.vue

@@ -461,6 +461,7 @@ export default {
     //查询候选人接口
     getTreeLists(e, status) {
       if (e === 9) {
+        this.close = "";
         this.active = this.active!=""? '' :'active'
         this.actives = ""
         this.MultipersonTransfer = true;

src/http/api.js

@@ -45,9 +45,19 @@ export function updateBase(e) {
         url: "/market/waf/updateBase",
         method: "post",
         headers: {
-          "Content-Type": "application/json",
+            "Content-Type": "application/json",
         },
         data: e,
     })
 }
-export default { getTodoBase, getDoneBase, getInitiateBase,updateBase };
+export function getNowdata(e) {
+    let yy = new Date().getFullYear()
+    let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
+    let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
+    let hh = new Date().getHours()
+    let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
+    let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
+    let time = yy + e.a + mm + e.a + dd + e.b + hh + e.c + mf + e.c + ss
+    return time
+}
+export default { getTodoBase, getDoneBase, getInitiateBase, updateBase, getNowdata };

yarn.lock

@@ -3983,6 +3983,18 @@ element-ui@^2.13.0:
     resize-observer-polyfill "^1.5.0"
     throttle-debounce "^1.0.1"
 
+element-ui@^2.15.7:
+  version "2.15.12"
+  resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz#fdde927a54078b17a85541ff7c0f0dad32488b8e"
+  integrity sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==
+  dependencies:
+    async-validator "~1.8.1"
+    babel-helper-vue-jsx-merge-props "^2.0.0"
+    deepmerge "^1.2.0"
+    normalize-wheel "^1.0.1"
+    resize-observer-polyfill "^1.5.0"
+    throttle-debounce "^1.0.1"
+
 elliptic@^6.5.3:
   version "6.5.4"
   resolved "https://registry.npmmirror.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"