8月15日

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
    // host: 'xt.test.sgjyun.com',
-   host: 'localhost',
+  //  host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/stock/stockInOrderAdd.vue

@@ -7,12 +7,12 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item"  v-loading="loading">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-loading="loading">保 存</el-button>
         <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
         <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
 
       <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
@@ -697,12 +697,6 @@
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             this.loading = true
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
             const array = this.recordInfo.recordData
             if(this.storehouse_id == 0){
               this.$message.error("仓库不能为空!")
@@ -742,7 +736,12 @@
               }
               this.recordInfo.recordData[i].warehousing_count = this.recordInfo.recordData[i].warehousing_count.toString()
             }
-        
+            const loading = this.$loading({
+              lock: true,
+              text: 'Loading',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
             const params = {
               'stockIn': this.recordInfo.recordData
             }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -21,7 +21,6 @@
           v-if="is_check == 2"
           v-loading="loading"
           class="filter-item"
-          v-loading="loading"
           >保 存</el-button
         >
         <el-button
@@ -43,7 +42,7 @@
       </div>
     </div>
 
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
       <stock-in-dialog
         ref="dialog"
         :propForm="propForm"

src/xt_pages/workforce/components/template_table.vue

@@ -32,7 +32,6 @@
         :row-style="{ color: '#303133' }"
         style="width: 100%"
 
-
         border
       >
         <el-table-column label="姓名" width="120">
@@ -101,7 +100,6 @@
                 :summary-method="getSummaries"
                 row-class-name="table-row-new-class schedule-table-row" @cell-click="itemClick"
                 sum-text="总数"
-                >
       >
         <el-table-column label="分区" width="80" align="center" fixed
                          style="width: 100px; background-color: red; display: block;">
@@ -469,24 +467,32 @@
       //     }
       // },
       makeDeviceNumbers: function(device_numbers) {
-
+        console.log("device_numbers",device_numbers)
+        var arr = []
+        for(let i=0;i<device_numbers.length;i++){
+          arr.push(device_numbers[i])
+        }
+        arr.sort(this.arraySort('sort'))
+        console.log("Arr2332232332",arr)
         var maked_device_numbers = []
         var weekdays = [1, 2, 3, 4, 5, 6, 7] // 周一-周日
         var time_types = [1, 2, 3] // 上下晚
-        for (let index = 0; index < device_numbers.length; index++) {
-          const device_number = device_numbers[index]
+        for (let index = 0; index < arr.length; index++) {
+          const device_number = arr[index]
           if(device_number.zone!=null){
             var zone = {
               id: device_number.zone.id,
               name: device_number.zone.name,
-              type: device_number.zone.type
+              type: device_number.zone.type,
+              sort:device_number.sort
             }
             var device = {
               id: device_number.id,
               number: device_number.number,
               group_id: device_number.group_id,
               zone_id: device_number.zone_id,
-              zone: zone
+              zone: zone,
+              sort:device_number.sort
             }
           }
 
@@ -511,7 +517,7 @@
           maked_device_numbers.push(device)
         }
 
-        console.log(maked_device_numbers)
+        console.log("数据源23232233223232322323我",maked_device_numbers)
         return maked_device_numbers
       },
       spanMethod({ row, column, rowIndex, columnIndex }) {
@@ -777,6 +783,61 @@
           this.saving = false
           this.is_editing = false
         })
+      },
+      getSummaries(param) {
+
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0 || index === 25) {
+            sums[index] = "总数";
+            return;
+          }
+          if (index === 1 || index === 24) {
+            sums[index] = data.length;
+            return;
+          }
+
+          const values = data.map(item => item[column.property]);
+
+          if (index === 23) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index];
+            return;
+          }
+
+          sums[index] = values.reduce((prev, curr) => {
+            if (typeof curr["treat_mode_id"] === "undefined") {
+              return prev;
+            }
+            const value = Number(curr["treat_mode_id"]);
+            if (!isNaN(value) && value > 0) {
+              return prev + 1;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index];
+        });
+        this.$nextTick(() => {
+          this.$refs.table.doLayout();
+        });
+
+        return sums;
+      },
+      arraySort(property) {
+        return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+        }
       }
     }
   }