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

src/enums/column-name.js

@@ -463,6 +463,10 @@ const columnName = [{
   {
     code: 123,
     name: '经销商产品调拨商品弹窗'
+  },
+  {
+    code: 124,
+    name: '交接单附件上传'
   }
 ]
 export const getColumnName = (key) => {

src/router/views/index.js

@@ -8,7 +8,8 @@ export default [{
       path: 'index',
       name: '首页',
       meta: {
-        i18n: 'dashboard'
+        i18n: 'dashboard',
+        keepAlive: true,
       },
       component: () =>
         import( /* webpackChunkName: "views" */ '@/views/wel/index')

src/views/approval/processConfig/index.vue

@@ -444,6 +444,8 @@ export default {
         }
         userList(params).then(res => {
           this.$set(row, 'userList', res.data.data);
+          // 选完角色部门默认全部带上
+          this.$set(row, 'auditUserId', res.data.data.map(item => item = item.id));
         })
       } else {
         this.$set(row, 'userList', [])

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1082,7 +1082,7 @@ export default {
           this.oldExchange = this.deepClone(data.receivableParities);
         })
         .finally(() => {
-          if (this.data.length > 0&&status=='currency') {
+          if (this.data.length > 0 && status == "currency") {
             this.data.forEach(e => {
               e.freight = transformCal(
                 e.freight,
@@ -1160,12 +1160,10 @@ export default {
       this.data[row.index].corpName = row.code;
     },
     priceTermsChange(row) {
-      if (!this.form.priceTermsDescription) {
-        if (row == "FOB" || row == "EXW") {
-          this.form.priceTermsDescription = this.form.portOfLoad;
-        } else {
-          this.form.priceTermsDescription = this.form.portOfDestination;
-        }
+      if (row == "FOB" || row == "EXW") {
+        this.form.priceTermsDescription = this.form.portOfLoad;
+      } else {
+        this.form.priceTermsDescription = this.form.portOfDestination;
       }
     },
     paymentTypeChange(row) {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1239,12 +1239,10 @@ export default {
       this.data[row.index].corpName = row.code;
     },
     priceTermsChange(row) {
-      if (!this.form.priceTermsDescription) {
-        if (row == "FOB" || row == "EXW") {
-          this.form.priceTermsDescription = this.form.portOfLoad;
-        } else {
-          this.form.priceTermsDescription = this.form.portOfDestination;
-        }
+      if (row == "FOB" || row == "EXW") {
+        this.form.priceTermsDescription = this.form.portOfLoad;
+      } else {
+        this.form.priceTermsDescription = this.form.portOfDestination;
       }
     },
     corpAttnChange() {
@@ -1273,7 +1271,7 @@ export default {
           this.oldExchange = this.deepClone(data.receivableParities);
         })
         .finally(() => {
-          if (this.data.length > 0&&status=='currency') {
+          if (this.data.length > 0 && status == "currency") {
             this.data.forEach(e => {
               e.freight = transformCal(
                 e.freight,
@@ -1590,7 +1588,7 @@ export default {
     },
     currencyChange() {
       if (this.form.currency && this.form.businesDate) {
-        this.getParities('currency');
+        this.getParities("currency");
       }
     },
     exchangeRateChange(row) {

src/views/maintenance/integral/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "corpId",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -49,7 +49,7 @@
       "label": "积分",
       "prop": "inPoints",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -59,7 +59,7 @@
       "label": "兑换",
       "prop": "outPoints",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -67,7 +67,7 @@
       "label": "积分余额",
       "prop": "balancePoints",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/overpayment/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "corpId",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -40,7 +40,7 @@
       "label": "增加",
       "prop": "inOverpayment",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -48,7 +48,7 @@
       "label": "使用",
       "prop": "outOverpaymen",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -56,7 +56,7 @@
       "label": "余额",
       "prop": "balanceOverpaymen",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/rebate/config/mainList.json

@@ -32,7 +32,7 @@
       "label": "客户",
       "prop": "cname",
       "search": true,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -40,7 +40,7 @@
       "label": "总返利",
       "prop": "profitReturn",
       "search": false,
-      "index": 2,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8,
@@ -50,7 +50,7 @@
       "label": "已用返利",
       "prop": "usedProfit",
       "search": false,
-      "index": 3,
+      "index": 4,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -58,7 +58,7 @@
       "label": "可用返利",
       "prop": "surplusProfit",
       "search": false,
-      "index": 4,
+      "index": 5,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -66,7 +66,7 @@
       "label": "本月待到账",
       "prop": "monthProfit",
       "search": false,
-      "index": 4,
+      "index": 6,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -174,6 +174,7 @@
                 size="small"
                 @click="rowCell(row, index)"
                 icon="el-icon-edit"
+                :disabled="form.status == 0"
               >{{ row.$cellEdit ? "保存" : "修改" }}
               </el-button>
               <el-button

src/views/maintenance/salesPolicy/index.vue

@@ -53,6 +53,7 @@
             icon="el-icon-delete"
             size="small"
             @click.stop="rowDel(scope.row,scope.index)"
+            :disabled="scope.row.status == 0"
           >删除
           </el-button>
         </template>

src/views/reimbursement/detail.vue

@@ -187,7 +187,7 @@
               @clear="row.feeList = feesOption"
               placeholder="请选择"
             ></avue-cascader>
-            <span v-else>{{ row.mold }}</span>
+            <span v-else="!row.$cellEdit">{{ row.mold }}</span>
           </template>
           <template slot="detailId" slot-scope="{ row }">
             <el-select
@@ -509,7 +509,8 @@ export default {
         this.form = res.data.data;
         this.dataList = this.form.itemList? this.form.itemList: [];
         this.dataList.forEach(item => {
-          this.moldChange(item.moldId, item, this.dicArea, false)
+          this.moldChange(item.moldId, item, this.dicArea)
+          item.payMethod = item.payMethod.toString();
         })
         this.oldForm = {...this.form};
         this.oldDataList = [...this.dataList];
@@ -713,13 +714,10 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
-    moldChange(e, row, list, remove = true) {
-      if (remove && row.moldId != e) {
-        this.$set(row, 'detailId', null);
-      }
+    moldChange(e, row, list) {
       list.forEach(item => {
         if (e == item.value) {
-          this.$set(row, 'mold', item.title)
+          this.$set(row, 'mold', item.title);
           getFeesList({size: 10, current: 1,feesTypeId: e}).then(res => {
             this.$set(row, 'feeList', res.data.data.total > 0? res.data.data.records: []);
             if (Math.ceil(res.data.data.total / 10) > 1) {
@@ -728,12 +726,22 @@ export default {
                   row.feeList = row.feeList.concat(e.data.data.records);
                 });
               }
+              this.$nextTick(() => {
+                if (!(row.feeList.some(item => item.id == row.detailId))) {
+                  this.$set(row, 'detailId', null);
+                }
+              })
+            } else {
+              this.$nextTick(() => {
+                if (!(row.feeList.some(item => item.id == row.detailId))) {
+                  this.$set(row, 'detailId', null);
+                }
+              })
             }
           });
         }
-
         if (item.hasChildren) {
-          this.moldChange(e, row, item.children, false)
+          this.moldChange(e, row, item.children)
         }
       })
     },

src/views/statisticAnalysis/payment/index.vue

@@ -274,6 +274,8 @@ export default {
         this.tradeType = "GN";
       } else if (sysType == 1) {
         this.tradeType = "XX";
+      }else if(sysType == 999){
+        this.tradeType = "ADMIN";
       }
     },
     onLoad(page, params) {

src/views/wel/components/audit-data.vue

@@ -87,6 +87,8 @@ export default {
         this.tradeType = "GN";
       } else if (sysType == 1) {
         this.tradeType = "XX";
+      }else if(sysType == 999){
+        this.tradeType = "ADMIN";
       }
     },
     getCheckDate() {

src/views/wel/components/realtime-data.vue

@@ -193,6 +193,8 @@ export default {
         this.tradeType = "GN";
       } else if (sysType == 1) {
         this.tradeType = "XX";
+      }else if(sysType == 999){
+        this.tradeType = "ADMIN";
       }
     },
     getrealTimeData() {

src/views/wel/components/sales-reached.vue

@@ -74,6 +74,8 @@ export default {
         this.tradeType = "GN";
       } else if (sysType == 1) {
         this.tradeType = "XX";
+      } else if (sysType == 999) {
+        this.tradeType = "ADMIN";
       }
     },
     getmonthSales() {

src/views/wel/components/sales-trend.vue

@@ -99,11 +99,13 @@ export default {
         this.tradeType = "GN";
       } else if (sysType == 1) {
         this.tradeType = "XX";
+      } else if (sysType == 999) {
+        this.tradeType = "ADMIN";
       }
     },
     getsalesTrend() {
       this.loading = true;
-      this.moneyList=[]
+      this.moneyList = [];
       salesTrend({
         tradeType: this.tradeType,
         billType: "XS",
@@ -120,7 +122,7 @@ export default {
         });
     },
     refresh() {
-      this.init()
+      this.init();
     },
     polylineData() {
       let polylineData = this.$echarts.init(

src/views/wel/home/tongjiSchool.vue

@@ -3,12 +3,36 @@
     <basic-container>
       <div class="container" style="height: 400px;">
         <div class="container-items">
-          <but-card iconName="el-icon-edit-outline" name="小学部工资" />
-          <but-card iconName="el-icon-edit-outline" name="初中部工资" />
-          <but-card iconName="el-icon-edit-outline" name="高中部工资" />
-          <but-card iconName="el-icon-edit-outline" name="后勤工资" />
-          <but-card iconName="el-icon-edit-outline" name="添加教师" />
-          <but-card iconName="el-icon-edit-outline" name="添加后勤" />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="小学部工资"
+            @click.native="inPage(1)"
+          />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="初中部工资"
+            @click.native="inPage(2)"
+          />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="高中部工资"
+            @click.native="inPage(3)"
+          />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="后勤部工资"
+            @click.native="inPage(4)"
+          />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="添加教师"
+            @click.native="inPage(5)"
+          />
+          <but-card
+            iconName="el-icon-edit-outline"
+            name="添加后勤"
+            @click.native="inPage(6)"
+          />
         </div>
         <index-card title="教师工资总体数据" iconName="el-icon-view">
           <div slot="select">
@@ -102,6 +126,22 @@
           <el-select
             slot="content"
             size="mini"
+            v-model="salaryType3"
+            placeholder="请选择"
+            style="margin-right:10px"
+            @change="getsalaryDataChain"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            slot="content"
+            size="mini"
             v-model="moon"
             placeholder="请选择月份"
             @change="moonChange"
@@ -132,21 +172,6 @@
             >
             </el-option>
           </el-select>
-           <el-select
-            slot="content"
-            size="mini"
-            v-model="salaryType3"
-            placeholder="请选择"
-            @change="getsalaryDataChain"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
         </div>
 
         <div slot="content" style="height:450px" id="commoDity2"></div>
@@ -157,11 +182,7 @@
 </template>
 
 <script>
-import {
-  salaryStatistics,
-  salaryData,
-  salaryDataChain
-} from "@/api/wel";
+import { salaryStatistics, salaryData, salaryDataChain } from "@/api/wel";
 import { mapGetters } from "vuex";
 import indexCard from "../components/card.vue";
 import butCard from "../components/butCard.vue";
@@ -184,7 +205,7 @@ export default {
       annual3: "2022",
       salaryType: "",
       salaryType2: "",
-      salaryType3:"",
+      salaryType3: "",
       isHeight: {},
       options: [
         {
@@ -331,6 +352,28 @@ export default {
     ...mapGetters(["userInfo"])
   },
   methods: {
+    inPage(type) {
+      switch (type) {
+        case 1:
+          this.$router.push("/salaryManagement/primarySchool/index");
+          break;
+        case 2:
+          this.$router.push("/salaryManagement/juniorhighSchool/index");
+          break;
+        case 3:
+          this.$router.push("/salaryManagement/highSchool/index");
+          break;
+        case 4:
+          this.$router.push("/salaryManagement/logisticsDepartment/index");
+          break;
+        case 5:
+          this.$router.push("/basicData/facultyManagement/index");
+          break;
+        case 6:
+          this.$message.error("暂无此页面");
+          break;
+      }
+    },
     getsalaryStatistics() {
       this.fsalaryList = [];
       this.studentNumberList = [];
@@ -364,7 +407,7 @@ export default {
         annual: this.annual3,
         moon: this.moon,
         semester: this.semester,
-        salaryType:this.salaryType3
+        salaryType: this.salaryType3
       })
         .then(res => {
           let data = res.data.data;