修改bug

src/views/basicData/facultyManagement/detailsPage.vue

@@ -11,13 +11,19 @@
             >返回列表
           </el-button>
         </div>
-        <el-button
-          class="el-button--small-yh add-customer-btn"
-          type="primary"
-          size="small"
-          @click="editCustomer"
-          >保存数据
-        </el-button>
+        <div class="add-customer-btn">
+          <el-button
+            type="success"
+            :disabled="!form.id"
+            size="small"
+            @click="copyDoc"
+          >
+            复制新单
+          </el-button>
+          <el-button type="primary" size="small" @click="editCustomer"
+            >保存数据
+          </el-button>
+        </div>
       </div>
       <containerTitle
         title="基础资料"
@@ -650,7 +656,7 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-                        row: true,
+            row: true,
             span: 6
           },
           {
@@ -697,7 +703,8 @@ export default {
             cell: true
           }
         ]
-      }
+      },
+      loading: false
     };
   },
   props: {
@@ -717,14 +724,39 @@ export default {
     cellStyle() {
       return "padding:0;height:40px;";
     },
+    copyDoc() {
+      this.$emit("copyOrder", this.form.id);
+    },
     getDetail(id) {
+      this.loading = true;
       detail(id)
         .then(res => {
+          if (this.detailData.status == "copy") {
+            delete res.data.data.id;
+            delete res.data.data.createTime;
+            delete res.data.data.createUser;
+            delete res.data.data.createUserName;
+            delete res.data.data.updateTime;
+            delete res.data.data.updateUser;
+            delete res.data.data.updateUserName;
+            delete res.data.data.status;
+            delete res.data.data.isDeleted;
+            res.data.data.causeList.forEach(e => {
+              delete e.id;
+              delete e.pid;
+              delete e.createTime;
+              delete e.createUser;
+              delete e.updateTime;
+              delete e.updateUser;
+              delete e.status;
+              delete e.isDeleted;
+            });
+          }
           this.form = res.data.data;
           this.dataList = res.data.data.causeList;
         })
         .finally(() => {
-          // this.loading = false;
+          this.loading = false;
           // this.showBut = true;
           // this.pageLoading = false;
         });
@@ -764,22 +796,22 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          const num = addAllsalary(
-            this.form.salaryWithdrawalStandard,
-            this.form.rankWithdrawalStandard,
-            this.form.virtualWorkloadSalary
-          );
-          const num2 = addAllsalary2(
-            this.form.salaryBase,
-            this.form.workloadSalary,
-            this.form.dailyAssessmentCriteria,
-            this.form.termPerformanceSalary
-          );
-          if (num != num2) {
-            return this.$message.error(
-              "拨付金额" + num + "不等于标准金额" + num2
-            );
-          }
+          // const num = addAllsalary(
+          //   this.form.salaryWithdrawalStandard,
+          //   this.form.rankWithdrawalStandard,
+          //   this.form.virtualWorkloadSalary
+          // );
+          // const num2 = addAllsalary2(
+          //   this.form.salaryBase,
+          //   this.form.workloadSalary,
+          //   this.form.dailyAssessmentCriteria,
+          //   this.form.termPerformanceSalary
+          // );
+          // if (num != num2) {
+          //   return this.$message.error(
+          //     "拨付金额" + num + "不等于标准金额" + num2
+          //   );
+          // }
           submit({ ...this.form, causeList: this.dataList })
             .then(res => {
               this.$message.success("保存成功");

src/views/basicData/facultyManagement/index.vue

@@ -15,6 +15,7 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         :cell-style="cellStyle"
+        @selection-change="selectionChange"
         @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="menuLeft">
@@ -39,6 +40,13 @@
             @click.stop="openExport()"
             >导出
           </el-button>
+          <el-button
+            type="success"
+            size="small"
+            @click.stop="copyDoc()"
+            :disabled="selectionList.length != 1"
+            >复制新单</el-button
+          >
         </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button type="text" size="small" @click.stop="editOpen(row, 1)">
@@ -109,7 +117,12 @@
         </p>
       </el-dialog>
     </basic-container>
-    <details-page v-if="!show" @goBack="backToList" :detailData="detailData" />
+    <details-page
+      v-if="!show"
+      @goBack="backToList"
+      @copyOrder="copyOrder"
+      :detailData="detailData"
+    />
   </div>
 </template>
 
@@ -121,6 +134,7 @@ export default {
   name: "index",
   data() {
     return {
+      selectionList: [],
       show: true,
       loading: false,
       form: {},
@@ -145,6 +159,8 @@ export default {
         editBtn: false,
         delBtn: false,
         menuWidth: 140,
+        tip: false,
+        selection: true,
         dialogClickModal: false,
         searchLabelWidth: 100,
         searchIcon: true,
@@ -461,6 +477,28 @@ export default {
       this.onLoad(this.page, this.search);
       done();
     },
+    copyDoc() {
+      this.selectionList.forEach(e => {
+        this.detailData = {
+          id: e.id,
+          status: "copy"
+        };
+        this.show = false;
+      });
+    },
+    copyOrder(id) {
+      this.show = true;
+      this.detailData = {
+        id: id,
+        status: "copy"
+      };
+      this.$nextTick(() => {
+        this.show = false;
+      });
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
     onLoad(page, params) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, params)

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -117,7 +117,7 @@
                 @change="parameterChange(row, index)"
                 clearable
                 :disabled="detailData.status == 1"
-                v-else-if="form.resultType == '级别'"
+                v-else-if="form.resultType == '职位'"
               >
                 <el-option
                   v-for="item in jobLevelList"
@@ -127,6 +127,40 @@
                 >
                 </el-option>
               </el-select>
+              <el-select
+                size="small"
+                v-model="row.parameter"
+                placeholder="请选择"
+                @change="parameterChange(row, index)"
+                clearable
+                :disabled="detailData.status == 1"
+                v-else-if="form.resultType == '职级等级'"
+              >
+                <el-option
+                  v-for="item in occupationalLevelList"
+                  :key="item.id"
+                  :label="item.dictValue"
+                  :value="item.dictValue"
+                >
+                </el-option>
+              </el-select>
+              <el-select
+                size="small"
+                v-model="row.parameter"
+                placeholder="请选择"
+                @change="parameterChange(row, index)"
+                clearable
+                :disabled="detailData.status == 1"
+                v-else-if="form.resultType == '学历'"
+              >
+                <el-option
+                  v-for="item in maritalList"
+                  :key="item.id"
+                  :label="item.dictValue"
+                  :value="item.dictValue"
+                >
+                </el-option>
+              </el-select>
               <el-input-number
                 size="small"
                 v-else-if="form.resultType == '校龄'"
@@ -148,7 +182,6 @@
             <span v-else>{{ row.parameter }}</span>
           </template>
         </avue-crud>
-        
       </basic-container>
     </div>
   </div>
@@ -218,7 +251,7 @@ export default {
             span: 6
           },
           {
-            label: "计算类别",
+            label: "分类",
             prop: "resultType",
             // rules: [
             //   {
@@ -268,7 +301,7 @@ export default {
         stripe: true,
         column: [
           {
-            label: "类别",
+            label: "分类明细",
             prop: "parameter",
             overHidden: true
           },
@@ -291,7 +324,9 @@ export default {
       },
       resultList: [],
       jobTitleList: [],
-      jobLevelList: []
+      jobLevelList: [],
+      occupationalLevelList: [],
+      maritalList:[]
     };
   },
   props: {
@@ -315,6 +350,12 @@ export default {
     this.getWorkDicts("job_level").then(res => {
       this.jobLevelList = res.data.data;
     });
+    this.getWorkDicts("occupational_level").then(res => {
+      this.occupationalLevelList = res.data.data;
+    });
+    this.getWorkDicts("marital_status").then(res => {
+      this.maritalList = res.data.data;
+    });
   },
   methods: {
     cellStyle() {
@@ -410,7 +451,7 @@ export default {
             if (
               this.dataList[i].salary == null ||
               this.dataList[i].salary == undefined ||
-              this.dataList[i].salary == ""
+              this.dataList[i].salary === ""
             ) {
               return this.$message.error(`请输入第${i + 1}行的工资标准`);
             }

src/views/basicData/salaryConfiguration/index.vue

@@ -160,7 +160,7 @@ export default {
             span: 8
           },
           {
-            label: "计算类别",
+            label: "分类",
             prop: "resultType",
             type: "select",
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=result_type",
@@ -213,7 +213,7 @@ export default {
         menu: false,
         column: [
           {
-            label: "类别",
+            label: "分类明细",
             prop: "parameter",
             overHidden: true
           },