Merge branch 'dev_info' into 'master'

Dev info

See merge request spfm-group/spfm-market-front!41

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

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
- * @LastEditTime: 2022-02-15 15:59:58
+ * @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(",")[
@@ -435,10 +439,6 @@ export default {
         type: "json",
       });
     },
-    // formateNumber(String) {
-    //   console.log(String, "daa");
-    //   if(String.split(','))
-    // },
     handleForbid() {
       // const object = {};
       const { permission_type } = this.form;
@@ -508,7 +508,7 @@ export default {
             });
             let changedList = middle.join(",").split(",");
             that.rowList.push(...changedList);
-            console.log(that.rowList,'that.rowList');
+            console.log(that.rowList, "that.rowList");
           },
         },
       };
@@ -570,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;
         //  特殊权限
@@ -585,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],
           })
         );
@@ -648,56 +653,6 @@ export default {
       } else {
         // 职位
         let duty = JSON.parse(sessionStorage.userInfo).duty;
-        // let { permission_type, charge } = this.form;
-        this.rowList.shift();
-        let reqdata = {
-          rowIndex: [...new Set(this.rowList)]
-            .sort(function (a, b) {
-              return a - b;
-            })
-            .join(","),
-          rowContent: [...new Set(this.rowList)]
-            .sort(function (a, b) {
-              return a - b;
-            })
-            .map((el) => {
-              return data.data[el];
-            }),
-        };
-        console.log(reqdata, "reqdata");
-        // if (permission_type) {
-        //   // 特殊权限
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     ),
-        // rowContent: this.paramsArr(
-        //   charge[0].row_start - 1,
-        //   charge[0].row_end - 1
-        // )
-        //   .split(",")
-        //   .map((el) => {
-        //     return data.data[el];
-        //   }),
-        //   };
-        // } else {
-        //   // 公共权限
-        //   const RowList = [];
-        //   const RowContent = [];
-        //   data.data.forEach((item, rowIndex) => {
-        //     if (this.confirmArrayData(item)) {
-        //       RowList.push(rowIndex);
-        //       RowContent.push(item);
-        //     }
-        //   });
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: RowList.join(","),
-        //     rowContent: RowContent,
-        //   };
-        // }
         if (duty === "7") {
           this.manager_approve = true;
         } else {
@@ -720,6 +675,21 @@ export default {
             return;
           }
           // 员工提交
+          this.rowList.shift();
+          let reqdata = {
+            rowIndex: [...new Set(this.rowList)]
+              .sort(function (a, b) {
+                return a - b;
+              })
+              .join(","),
+            rowContent: [...new Set(this.rowList)]
+              .sort(function (a, b) {
+                return a - b;
+              })
+              .map((el) => {
+                return data.data[el];
+              }),
+          };
           await this.$http({
             url: edit_url, //提交
             method: "post",
@@ -827,7 +797,7 @@ export default {
         const sheet_name = window.luckysheet.getSheet().name;
         const data = window.luckysheet.getSheet(sheet_name);
         const workbook_name = window.luckysheet.getWorkbookName();
-        // let { permission_type, charge } = this.form;
+        // 经理提交
         this.rowList.shift();
         let reqdata = {
           rowIndex: [...new Set(this.rowList)]
@@ -843,39 +813,6 @@ export default {
               return data.data[el];
             }),
         };
-        // if (permission_type) {
-        //   // 特殊权限
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     ),
-        //     rowContent: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     )
-        //       .split(",")
-        //       .map((el) => {
-        //         return data.data[el];
-        //       }),
-        //   };
-        // } else {
-        //   // 公共权限
-        //   const RowList = [];
-        //   const RowContent = [];
-        //   data.data.forEach((item, rowIndex) => {
-        //     if (this.confirmArrayData(item)) {
-        //       RowList.push(rowIndex);
-        //       RowContent.push(item);
-        //     }
-        //   });
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: RowList.join(","),
-        //     rowContent: RowContent,
-        //   };
-        // }
         await this.$http({
           url: "/market/CMKIssued/CMKIssuedSubmit", // 提交
           method: "post",
@@ -993,16 +930,19 @@ 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}`,
         }));
       });
     },
   },
   mounted() {
-    console.log(this.status, "s");
+    console.log(this.destroy, "destroy");
     this.handleInit();
     this.handleChargeList();
   },
+  destroyed() {
+    window.luckysheet.destroy();
+  },
 };
 </script>
 

src/pages/main/performance/department.vue

@@ -1,12 +1,7 @@
 <template>
   <div>
     <div class="simple-container">
-      <simple-form :form="table_form" @search="handleSearch">
-        <!-- :handle="table_handle"
-      @add="handleRulesVisible"
-      @class="handleDrawer('class')"
-      @download="handleDownload" -->
-      </simple-form>
+      <simple-form :form="table_form" @search="handleSearch"> </simple-form>
       <simple-table
         :list="table_list"
         :config="table_config"
@@ -46,13 +41,6 @@
                 @click="handleTransfer"
                 >转派</el-button
               >
-              <!-- 提交按钮 科员可见 9  -->
-              <!-- <el-button
-                type="primary"
-                v-if="edit_form.status === '1' && duty === '9'"
-                @click="handleSubmit"
-                >提交</el-button
-              > -->
               <!-- 审批按钮 科室经理、分管副总、总经理可见  -->
               <el-button
                 type="primary"
@@ -65,14 +53,7 @@
                 >审批</el-button
               >
             </template>
-            <!-- <el-button type="primary" @click="handleTrack">流程跟踪</el-button>
-            <el-button type="primary">导出</el-button> -->
           </div>
-          <!-- <div>
-            <el-button @click="handleCancel('visible')" type="primary"
-              >返回</el-button
-            >
-          </div> -->
         </div>
         <!-- 主体部分 -->
         <simple-sheet
@@ -288,34 +269,6 @@
         </el-form-item>
       </el-form>
     </simple-dialog>
-    <!-- <simple-dialog
-      title="流程跟踪"
-      :visible="track_visible"
-      :reload="reload"
-      width="600px"
-      props="track_visible"
-      @confirm="handleConfirm"
-      @cancel="handleCancel('track_visible')"
-    >
-      <el-table :data="trackList" border>
-        <el-table-column
-          prop="link"
-          label="流程环节"
-          align="center"
-          width="180"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="creatperson"
-          label="处理人"
-          align="center"
-          width="180"
-        >
-        </el-table-column>
-        <el-table-column prop="explain" label="审批说明" align="center">
-        </el-table-column>
-      </el-table>
-    </simple-dialog> -->
   </div>
 </template>
 
@@ -851,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"],
           },
         },
         {

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "http://192.168.1.9:9114",
+                target: "http://192.168.3.12:9114",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -101,7 +101,7 @@ module.exports = {
                 },
             },
             "/market/mk": {
-                target: "http://192.168.1.9:9114",
+                target: "http://192.168.3.12:9114",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -109,7 +109,7 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
-                target: "http://192.168.1.9:9114",
+                target: "http://192.168.3.12:9114",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-                target: "http://192.168.1.9:9114",
+                target: "http://192.168.3.12:9114",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {