Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/fee-info/main.vue

@@ -132,7 +132,7 @@
             oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d\d\d\d\d).*$/, "$1.$2")'
             @input="countChange(row)"
           ></el-input>
-          <span v-else>{{ row.quantity | IntegerFormat }}</span>
+          <span v-else>{{ row.quantity | decimalFormat }}</span>
         </template>
         <template slot="amount" slot-scope="{ row }">
           <span>{{ row.amount | micrometerFormat }}</span>
@@ -379,11 +379,11 @@ export default {
       return micrometerFormat(val);
     },
     decimalFormat(num) {
-      return num ? Number(num).toFixed(2) : "0.00";
+      return num ? Number(num).toFixed(6) : "0.00";
     },
     IntegerFormat(num) {
       return IntegerFormat(num);
-    }
+    },
   },
   async created() {
     this.feeOption = await this.getColumnData(
@@ -791,7 +791,7 @@ export default {
             });
             //数量总计
             if (item.property == "quantity") {
-              sums[index] = qtySum ? qtySum.toFixed(2) : "0.00";
+              sums[index] = qtySum ? qtySum.toFixed(6) : "0.00";
             }
             //金额总计
             if (item.property == "amount") {

src/router/views/index.js

@@ -387,6 +387,20 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/portinformation/index')
     }]
   },
+  //汇率管理
+  {
+    path: '/basicData/rateManagement/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/basicData/rateManagement/index',
+      name: '汇率管理',
+      meta: {
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/basicData/rateManagement/index')
+    }]
+  },
   //产品价格
   {
     path: '/maintenance/priceLibrary/index',

src/util/validate.js

@@ -1,3 +1,7 @@
+//保留两位小数
+export function decimalFormat(num){
+  return num ? Number(num).toFixed(2) : "0.00";
+}
 //数字取整
 export function IntegerFormat(num){
   num=Number(num?num:0)

src/views/basicData/commodityType/detailsPageEdit.vue

@@ -59,7 +59,7 @@
                   placeholder=" "
                   type="tree"
                   size="small"
-                  dataType='string'
+                  dataType="string"
                   :dic="dicData"
                 />
                 <el-input
@@ -318,6 +318,7 @@ import {
 } from "@/api/basicData/customerInformation";
 import userOption from "../customerInformation/configuration/mainList.json";
 import sftOption from "./configuration/specification.json";
+import { mapGetters } from "vuex";
 export default {
   name: "detailsPage",
   data() {
@@ -756,6 +757,9 @@ export default {
           : [];
       });
     }
+    if (!this.permission.goods_gys) {
+      this.basicData.column.splice(this.basicData.column.findIndex(item => item.prop =='corpId'), 1)
+    }
   },
   methods: {
     copyDoc() {
@@ -1011,6 +1015,9 @@ export default {
     backToList() {
       this.$emit("goBack");
     }
+  },
+  computed: {
+    ...mapGetters(["permission"])
   }
 };
 </script>

src/views/basicData/facultyManagement/detailsPage.vue

@@ -76,7 +76,7 @@
               type="text"
               @click="rowCell(row, index)"
               :disabled="detailData.status == 1"
-              >编辑</el-button
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
               size="small"
@@ -307,6 +307,32 @@ export default {
             span: 6
           },
           {
+            label: "日常考核等级",
+            prop: "dailyGrade",
+            type: "select",
+            dataType: "string",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=daily_assessment_level",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
+            label: "学期绩效等级",
+            prop: "performanceGrade",
+            type: "select",
+            dataType: "string",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=daily_assessment_level",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "班主任",
             prop: "doubleTeachers",
             type: "select",
@@ -317,6 +343,19 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            span: 6
+          },
+          {
+            label: "在职状态",
+            prop: "status",
+            type: "select",
+            dataType: "number",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=in_service_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
             row: true,
             span: 6
           },
@@ -722,6 +761,7 @@ export default {
     },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
+        this.editCustomer();
         this.$set(row, "$cellEdit", false);
       } else {
         this.$set(row, "$cellEdit", true);
@@ -785,6 +825,11 @@ export default {
     },
     //返回列表
     backToList() {
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataList[i].$cellEdit) {
+          return this.$message.error(`请保存明细表数据`);
+        }
+      }
       this.$emit("goBack");
     }
   }

src/views/basicData/facultyManagement/index.vue

@@ -165,7 +165,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 16,
         align: "center",
         searchSpan: 8,
         border: true,
@@ -287,6 +287,21 @@ export default {
             span: 8
           },
           {
+            label: "在职状态",
+            prop: "status",
+            type: "select",
+            dataType: "number",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=in_service_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            },
+            search: true,
+            width: "100",
+            overHidden: true
+          },
+          {
             label: "联系电话",
             prop: "phone",
             width: "100",

src/views/basicData/salaryConfiguration/detailsPage.vue

@@ -100,7 +100,7 @@
               type="text"
               @click="rowCell(row, index)"
               :disabled="detailData.status == 1"
-              >编辑</el-button
+              >{{ row.$cellEdit ? "保存" : "修改" }}</el-button
             >
             <el-button
               size="small"
@@ -208,6 +208,7 @@
 
 <script>
 import { detail, submit, delItem } from "@/api/basicData/salaryConfiguration";
+import { contrastObj, contrastList } from "@/util/contrastData";
 export default {
   name: "index",
   data() {
@@ -297,6 +298,17 @@ export default {
             span: 6
           },
           {
+            label: "授课类别",
+            prop: "classType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=class_type",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            span: 6
+          },
+          {
             label: "创建时间",
             prop: "createTime",
             disabled: true,
@@ -307,11 +319,11 @@ export default {
             prop: "remarks",
             type: "textarea",
             minRows: 2,
-            span: 12
+            span: 24
           }
         ]
       },
-      tableOption:{
+      tableOption: {
         align: "center",
         addBtn: false,
         refreshBtn: false,
@@ -516,6 +528,7 @@ export default {
     },
     rowCell(row, index) {
       if (row.$cellEdit == true) {
+        this.editCustomer()
         this.$set(row, "$cellEdit", false);
       } else {
         this.$set(row, "$cellEdit", true);
@@ -598,6 +611,11 @@ export default {
     },
     //返回列表
     backToList() {
+      for(let i=0;i<this.dataList.length;i++){
+        if(this.dataList[i].$cellEdit){
+          return this.$message.error(`请保存明细表数据`);
+        }
+      }
       this.$emit("goBack");
     }
   }

src/views/basicData/salaryConfiguration/index.vue

@@ -21,12 +21,21 @@
       >
         <template slot-scope="{ row }" slot="expand">
           <avue-crud
+            v-show="row.normType == '工资拨付标准'"
             :data="row.itemData"
             :option="itemOption"
             :table-loading="row.itemLoading"
             :cell-style="cellStyle"
             class="itemTable"
           ></avue-crud>
+          <avue-crud
+            v-show="row.normType != '工资拨付标准'"
+            :data="row.itemData"
+            :option="itemOption2"
+            :table-loading="row.itemLoading"
+            :cell-style="cellStyle"
+            class="itemTable"
+          ></avue-crud>
         </template>
         <template slot="menuLeft">
           <el-button
@@ -93,7 +102,7 @@ export default {
       },
       option: {
         searchShow: true,
-        searchMenuSpan: 8,
+        searchMenuSpan: 24,
         align: "center",
         searchSpan: 8,
         tip: false,
@@ -129,11 +138,10 @@ export default {
             span: 8
           },
           {
-            label: "教师类别",
-            prop: "salaryWithdrawalStandardName",
+            label: "标准类别",
+            prop: "normType",
             type: "select",
-            dicUrl:
-              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
             props: {
               label: "dictValue",
               value: "dictValue"
@@ -145,10 +153,11 @@ export default {
             span: 8
           },
           {
-            label: "标准类别",
-            prop: "normType",
+            label: "教师类别",
+            prop: "salaryWithdrawalStandardName",
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=norm_type",
+            dicUrl:
+              "/api/blade-system/dict-biz/dictionary?code=Salary_allocation_standard",
             props: {
               label: "dictValue",
               value: "dictValue"
@@ -189,6 +198,20 @@ export default {
             span: 8
           },
           {
+            label: "授课类别",
+            prop: "classType",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=class_type",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            filterable: true,
+            width: "100",
+            search: true,
+            span: 8
+          },
+          {
             label: "创建人",
             prop: "createUserName",
             width: "100",
@@ -215,6 +238,72 @@ export default {
           {
             label: "分类明细",
             prop: "parameter",
+            overHidden: true,
+            width: 80
+          },
+          {
+            label: "工资标准",
+            prop: "salary",
+            overHidden: true,
+            width: 80
+          },
+           {
+            label: "工作量工资标准",
+            prop: "workloadSalaryName",
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: "虚拟工作量工资标准",
+            prop: "virtualWorkloadSalary",
+            overHidden: true,
+            width: 130
+          },
+          {
+            label: "双休日工作量工资标准",
+            prop: "doubleCease",
+            overHidden: true,
+            width: 150
+          },
+          {
+            label: "日常考核工资标准",
+            prop: "dailyAssessmentCriteriaName",
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: "虚拟双休日工作量工资标准",
+            prop: "virtualDoubleCease",
+            overHidden: true,
+            width: 170
+          },
+          {
+            label: "虚拟日常考核标准",
+            prop: "virtualDailyAssessmentCriteria",
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: "学期绩效工资标准",
+            prop: "termPerformanceSalaryName",
+            overHidden: true,
+            width: 120
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            overHidden: true
+          }
+        ]
+      },
+      itemOption2: {
+        align: "center",
+        header: false,
+        menu: false,
+        column: [
+          {
+            label: "分类明细",
+            prop: "parameter",
             overHidden: true
           },
           {
@@ -363,7 +452,7 @@ export default {
   height: 94.2vh;
 }
 ::v-deep .el-table__expanded-cell[class*="cell"] {
-  padding: 0px;
+  padding:0px 0px 0px 136px !important;
 }
 .itemTable ::v-deep .el-table {
   width: 738px;

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1049,9 +1049,6 @@ export default {
     }
   },
   methods: {
-    text() {
-      console.log("111");
-    },
     cellStyle() {
       return "padding:0;height:40px;";
     },

src/views/salaryManagement/highSchool/detailsPage.vue

@@ -112,7 +112,7 @@
               size="small"
               @click.stop="calculate2()"
               :disabled="detailData.status == 1"
-              >导入工资标准
+              >导入职工信息
             </el-button>
             <el-button
               type="info"
@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "高中部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/juniorhighSchool/detailsPage.vue

@@ -112,7 +112,7 @@
               size="small"
               @click.stop="calculate2()"
               :disabled="detailData.status == 1"
-              >导入工资标准
+              >导入职工信息
             </el-button>
             <el-button
               type="info"
@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "初中部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/logisticsDepartment/detailsPage.vue

@@ -112,7 +112,7 @@
               size="small"
               @click.stop="calculate2()"
               :disabled="detailData.status == 1"
-              >导入工资标准
+              >导入职工信息
             </el-button>
             <el-button
               type="info"
@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({inSection: "后勤部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {

src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -112,7 +112,7 @@
               size="small"
               @click.stop="calculate2()"
               :disabled="detailData.status == 1"
-              >导入工资标准
+              >导入职工信息
             </el-button>
             <el-button
               type="info"
@@ -1572,20 +1572,20 @@ export default {
         });
     },
     calculate2() {
-      return this.$message.error("正在开发中");
-      // if (!this.form.id) {
-      //   return this.$message.error("请先保存数据");
-      // }
-      // this.loading = true;
-      // calculate2({ pid: this.form.id })
-      //   .then(res => {
-      //     if (res.data.code == "200") {
-      //       this.getItemDetail();
-      //     }
-      //   })
-      //   .finally(() => {
-      //     this.loading = false;
-      //   });
+      // return this.$message.error("正在开发中");
+      if (!this.form.id) {
+        return this.$message.error("请先保存数据");
+      }
+      this.loading = true;
+      calculate2({ inSection: "小学部", pid: this.form.id })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.getItemDetail();
+          }
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     importExcel() {
       if (!this.form.id) {