文件收集修改

src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
- * @LastEditTime: 2022-03-03 12:00:50
+ * @LastEditTime: 2022-03-07 17:40:14
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 <template>
@@ -34,7 +34,7 @@
           >暂存</el-button
         >
         <el-button
-          v-if="status === '2'"
+          v-if="status === '2' || status === '3'"
           type="primary"
           @click="handleResave"
           :disabled="handleForbid()"
@@ -158,7 +158,9 @@
           </el-form-item>
         </el-radio-group>
       </el-form>
-      <template v-if="id && status !== '2'" v-slot:footer><div></div></template>
+      <template v-if="id && status !== '2' && status !== '3'" v-slot:footer
+        ><div></div
+      ></template>
     </simple-dialog>
     <simpleDialog
       title="提交"
@@ -313,7 +315,9 @@ export default {
     // },
     handleAllow({ row, column }) {
       let public_permisson =
-        (!this.form.permission_type || this.status === "2") &&
+        (!this.form.permission_type ||
+          this.status === "2" ||
+          this.status === "3") &&
         this.type === "edit";
       let editable =
         this.row_list.includes(row) && this.column_list.includes(column);
@@ -374,7 +378,7 @@ export default {
           this.form = {
             permission_type: Number(type) - 1,
             person: list.map((el) => {
-              return `${el.principalId},${el.principalName}`;
+              return `${el.principalMent}-${el.principalId},${el.principalName}`;
             }),
             charge: [
               {
@@ -395,7 +399,7 @@ export default {
             row_start: "",
             row_end: "",
             charge: list.map((el) => ({
-              person: el.principalId + "," + el.principalName,
+              person: `${el.principalMent}-${el.principalId},${el.principalName}`,
               col_start: el.allowEditingColumns.split(",")[0],
               col_end:
                 el.allowEditingColumns.split(",")[
@@ -566,14 +570,18 @@ export default {
       if (!permission_type) {
         //  公共权限
         const { person } = this.form;
+
         const principalId = [];
         const principalName = [];
+        const principalMent = [];
         person.forEach((el) => {
-          principalId.push(el.split(",")[0]);
+          principalMent.push(el.split(",")[0].split("-")[0]);
+          principalId.push(el.split(",")[0].split("-")[1]);
           principalName.push(el.split(",")[1]);
         });
         reqdata.principalId = principalId.join(",");
         reqdata.principalName = principalName.join(",");
+        reqdata.principalMent = principalName.join(",");
       } else {
         const { charge } = this.form;
         //  特殊权限
@@ -581,7 +589,8 @@ export default {
           JSON.stringify({
             allowEditingColumns: `${el.col_start},${el.col_end}`,
             rowNum: `${el.row_start},${el.row_end}`,
-            principalId: el.person.split(",")[0],
+            principalMent: el.person.split(",")[0].split("-")[0],
+            principalId: el.person.split(",")[0].split("-")[1],
             principalName: el.person.split(",")[1],
           })
         );
@@ -921,7 +930,7 @@ export default {
       }).then((response) => {
         this.charge_list = response.data.map((element) => ({
           label: `${element.ou} ${element.secLeaderName}`,
-          value: `${element.secLeaderLogin},${element.secLeaderName}`,
+          value: `${element.ou}-${element.secLeaderLogin},${element.secLeaderName}`,
         }));
       });
     },

src/pages/main/performance/department.vue

@@ -804,15 +804,15 @@ export default {
     },
     async handleTransfer() {
       let loginNoStr = JSON.parse(sessionStorage.userInfo).loginNoStr;
-      let groupId = JSON.parse(sessionStorage.userInfo).groupId;
+      let logNo = JSON.parse(sessionStorage.userInfo).loginNo;
       await this.$http({
-        url: "/sysmgr/sysuserinfo/queryList",
+        url: "/market/CMKIssued/queryUserList",
         method: "post",
         headers: {
           "Content-Type": "application/json",
         },
         data: {
-          groupId,
+          logNo,
         },
       }).then(({ data }) => {
         this.transfer_list_orgin = data

src/pages/main/performance/mould.vue

@@ -170,14 +170,14 @@ export default {
           label: "下发",
           props: "issue",
           visible: {
-            status: ["0"],
+            status: ["0", "3"],
           },
         },
         {
           label: "编辑",
           props: "redit",
           visible: {
-            status: ["2"],
+            status: ["2", "3"],
           },
         },
         {