浏览代码

no message

linwenxin 8 月之前
父节点
当前提交
12f664bbb1

+ 47 - 40
src/utils/common.js

@@ -2,44 +2,51 @@ import { MessageBox, Message, Notification } from '@zjlib/element-ui2'
 
 export function addHours(str) {
   // 获取当前时间
-  var currentDate = new Date(str);
+  var currentDate = new Date(str)
 
   // 增加一小时
-  currentDate.setHours(currentDate.getHours() + 1);
+  currentDate.setHours(currentDate.getHours() + 1)
 
   // 转换 "YYYY-MM-DD HH:mm:ss" 格式
-  var formattedDate = currentDate.getFullYear() + '-' +
-    ('0' + (currentDate.getMonth() + 1)).slice(-2) + '-' +
-    ('0' + currentDate.getDate()).slice(-2) + ' ' +
-    ('0' + currentDate.getHours()).slice(-2) + ':' +
-    ('0' + currentDate.getMinutes()).slice(-2) + ':' +
-    ('0' + currentDate.getSeconds()).slice(-2);
+  var formattedDate =
+    currentDate.getFullYear() +
+    '-' +
+    ('0' + (currentDate.getMonth() + 1)).slice(-2) +
+    '-' +
+    ('0' + currentDate.getDate()).slice(-2) +
+    ' ' +
+    ('0' + currentDate.getHours()).slice(-2) +
+    ':' +
+    ('0' + currentDate.getMinutes()).slice(-2) +
+    ':' +
+    ('0' + currentDate.getSeconds()).slice(-2)
 
   return formattedDate
 }
 
 export function tableDataParsing(fieldBeans) {
-  return fieldBeans.map((item, index) => {
-    var tiling =
-      item.tiling || item.tiling === null || item.tiling === undefined ? true : false;
-    return {
-      tiling,
-      exportField: item,
-      hidden: item.isShow === null ? false : !item.isShow,
-      isCopy: item.isCopy || false,
-      isTotal: item.isTotal || false,
-      sortNum: item.sortNum || 0,
-      recordType: item.type,
-      columnAttributes: {
-        fixed: item.fixed ? item.fixed : false,
-        label: item.label || '',
-        prop: item.jname,
-        width: item.width || 'auto',
-        'min-width': ((label) => label.length * 16 + 64)(item.label || ''),
-        align: ~['number', 'amount'].indexOf(item.type) ? 'right' : 'left',
-      },
-    };
-  });
+  return fieldBeans
+    .filter(item => !item.hide && item.noUse !== true)
+    .map((item, index) => {
+      var tiling = item.tiling || item.tiling === null || item.tiling === undefined ? true : false
+      return {
+        tiling,
+        exportField: item,
+        hidden: item.isShow === null ? false : !item.isShow,
+        isCopy: item.isCopy || false,
+        isTotal: item.isTotal || false,
+        sortNum: item.sortNum || 0,
+        recordType: item.type,
+        columnAttributes: {
+          fixed: item.fixed ? item.fixed : false,
+          label: item.label || '',
+          prop: item.jname,
+          width: item.width || 'auto',
+          'min-width': (label => label.length * 16 + 64)(item.label || ''),
+          align: ~['number', 'amount'].indexOf(item.type) ? 'right' : 'left'
+        }
+      }
+    })
 }
 
 export const successMsg = msg => {
@@ -199,17 +206,17 @@ export const debounce = (fn, delay = 1000) => {
 }
 
 export function thousands(num) {
-  if (num === null) {
-    return '';
-  }
-  var n = Number(num).toFixed(2);
-  if (isNaN(n)) {
-    return n;
-  }
-  n = n + '';
-  var [a, b] = n.split('.');
-  var aq = Number(a).toLocaleString();
-  return `${aq}.${b}`;
+  if (num === null) {
+    return ''
+  }
+  var n = Number(num).toFixed(2)
+  if (isNaN(n)) {
+    return n
+  }
+  n = n + ''
+  var [a, b] = n.split('.')
+  var aq = Number(a).toLocaleString()
+  return `${aq}.${b}`
 }
 
 export default {

+ 26 - 29
src/views/workOrder/workOrderPool/components/mixins/showRecordSelected.js

@@ -1,6 +1,6 @@
 import { required } from '@/components/template/rules_verify.js'
-import { orderBaseList } from "@/api/workOrderPool.js"
-import { tableDataParsing } from "@/utils/common.js"
+import { orderBaseList } from '@/api/workOrderPool.js'
+import { tableDataParsing } from '@/utils/common.js'
 export default {
   props: {
     recordSelected: {
@@ -19,38 +19,35 @@ export default {
         this.orderInfo.recordSelected = [...this.recordSelected.map(item => ({ ...item }))]
       },
       deep: true,
-      immediate: true,
-    },
+      immediate: true
+    }
   },
   created() {
-    orderBaseList({ "pageNum": 1, "pageSize": 1, "params": [{ "param": "a.id", "compare": "=", "value": "0" }] }).then(res => {
-      this.columns = tableDataParsing(
-        res.fieldBeans.filter(item => !~["orderFlags", "orderType"].indexOf(item.jname))
-      )
+    orderBaseList({ pageNum: 1, pageSize: 1, params: [{ param: 'a.id', compare: '=', value: '0' }] }).then(res => {
+      this.columns = tableDataParsing(res.fieldBeans.filter(item => !~['orderFlags', 'orderType'].indexOf(item.jname)))
     })
   },
   computed: {
     selectedItems() {
-      return [{
-        name: 'slot-component',
-        md: 24,
-        formItemAttributes: {
-          label: '',
-          'label-width': '0px',
-          prop: 'recordSelected',
-          rules: [...required],
-        },
-        render: (h, { props }) => {
-          return (
-            <div>
-              <zj-table
-                columns={this.columns}
-                table-data={this.orderInfo.recordSelected}
-              />
-            </div>
-          )
+      return [
+        {
+          name: 'slot-component',
+          md: 24,
+          formItemAttributes: {
+            label: '',
+            'label-width': '0px',
+            prop: 'recordSelected',
+            rules: [...required]
+          },
+          render: (h, { props }) => {
+            return (
+              <div>
+                <zj-table columns={this.columns} table-data={this.orderInfo.recordSelected} />
+              </div>
+            )
+          }
         }
-      }]
-    },
-  },
+      ]
+    }
+  }
 }

+ 28 - 27
src/views/workOrder/workOrderPool/components/reassignment/index.vue

@@ -2,21 +2,25 @@
   <zj-page-container>
     <zj-page-fill class="neibuview">
       <zj-form-container ref="formRef" :form-data="orderInfo" :form-attributes="{ size: 'mini' }">
-        <zj-form-module title="派单信息" label-width="100px" :form-data="orderInfo"
-          :form-items="pandanxinxi"></zj-form-module>
-        <zj-form-module title="已选工单" label-width="100px" :form-data="orderInfo"
-          :form-items="selectedItems"></zj-form-module>
+        <zj-form-module
+          title="派单信息"
+          label-width="100px"
+          :form-data="orderInfo"
+          :form-items="pandanxinxi"
+        ></zj-form-module>
+        <zj-form-module
+          title="已选工单"
+          label-width="100px"
+          :form-data="orderInfo"
+          :form-items="selectedItems"
+        ></zj-form-module>
       </zj-form-container>
     </zj-page-fill>
     <!-- 操作按钮 -->
     <div>
-      <div style="box-sizing: border-box;padding: 16px;text-align:right;">
-        <el-button size="mini" @click="$emit('close')">
-          取消
-        </el-button>
-        <el-button type="primary" size="mini" @click="allVerify">
-          确定
-        </el-button>
+      <div style="box-sizing: border-box; padding: 16px; text-align: right">
+        <el-button size="mini" @click="$emit('close')"> 取消 </el-button>
+        <el-button type="primary" size="mini" @click="allVerify"> 确定 </el-button>
       </div>
     </div>
   </zj-page-container>
@@ -24,20 +28,17 @@
 
 <script>
 import pandanxinxi from '../../detailModule/workOrderInfo/mixins/pandanxinxi.js'
-import showRecordSelected from "../mixins/showRecordSelected.js"
+import showRecordSelected from '../mixins/showRecordSelected.js'
 import { required } from '@/components/template/rules_verify.js'
-import { changeOrderChangeWorker } from "@/api/workOrderPool.js"
+import { changeOrderChangeWorker } from '@/api/workOrderPool.js'
 export default {
-  mixins: [
-    pandanxinxi,
-    showRecordSelected
-  ],
+  mixins: [pandanxinxi, showRecordSelected],
   data() {
     return {
       orderInfo: {
-        websitId: "",
-        workerId: "",
-        workerId_fz: "",
+        websitId: '',
+        workerId: '',
+        workerId_fz: '',
         orderWorkers: [],
         recordSelected: []
       },
@@ -68,9 +69,9 @@ export default {
           isEdit: true,
           isShow: true,
           isRules: [...required]
-        },
+        }
       }
-    },
+    }
   },
   methods: {
     allVerify() {
@@ -79,17 +80,17 @@ export default {
           changeOrderChangeWorker({
             ids: this.orderInfo.recordSelected.map(item => item.id),
             websitId: this.orderInfo.websitId,
-            workerIds: this.orderInfo.orderWorkers.map(item => item.workerId),
+            workerIds: this.orderInfo.orderWorkers.map(item => item.workerId)
           }).then(res => {
             this.$message({
               type: 'success',
               message: '派单成功!'
             })
-            this.$emit("close")
+            this.$emit('close')
           })
         }
       })
-    },
+    }
   }
 }
 </script>
@@ -99,11 +100,11 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep &>.zj-page-fill-scroll {
+  ::v-deep & > .zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 
-    &>div:nth-child(1) {
+    & > div:nth-child(1) {
       margin-top: 20px;
     }
   }

+ 28 - 26
src/views/workOrder/workOrderPool/components/reschedule/index.vue

@@ -2,39 +2,41 @@
   <zj-page-container>
     <zj-page-fill class="neibuview">
       <zj-form-container ref="formRef" :form-data="orderInfo" :form-attributes="{ size: 'mini' }">
-        <zj-form-module title="预单信息" label-width="110px" :form-data="orderInfo"
-          :form-items="serviceInfo"></zj-form-module>
-        <zj-form-module title="已选工单" label-width="100px" :form-data="orderInfo"
-          :form-items="selectedItems"></zj-form-module>
+        <zj-form-module
+          title="预单信息"
+          label-width="110px"
+          :form-data="orderInfo"
+          :form-items="serviceInfo"
+        ></zj-form-module>
+        <zj-form-module
+          title="已选工单"
+          label-width="100px"
+          :form-data="orderInfo"
+          :form-items="selectedItems"
+        ></zj-form-module>
       </zj-form-container>
     </zj-page-fill>
     <!-- 操作按钮 -->
     <div>
-      <div style="box-sizing: border-box;padding: 16px;text-align:right;">
-        <el-button size="mini" @click="$emit('close')">
-          取消
-        </el-button>
-        <el-button type="primary" size="mini" @click="allVerify">
-          确定
-        </el-button>
+      <div style="box-sizing: border-box; padding: 16px; text-align: right">
+        <el-button size="mini" @click="$emit('close')"> 取消 </el-button>
+        <el-button type="primary" size="mini" @click="allVerify"> 确定 </el-button>
       </div>
     </div>
   </zj-page-container>
 </template>
 
 <script>
-import showRecordSelected from "../mixins/showRecordSelected.js"
+import showRecordSelected from '../mixins/showRecordSelected.js'
 import { required } from '@/components/template/rules_verify.js'
-import { changeOrderChangeAppointmentTime } from "@/api/workOrderPool.js"
-import { addHours } from "@/utils/common.js"
+import { changeOrderChangeAppointmentTime } from '@/api/workOrderPool.js'
+import { addHours } from '@/utils/common.js'
 export default {
-  mixins: [
-    showRecordSelected
-  ],
+  mixins: [showRecordSelected],
   data() {
     return {
       orderInfo: {
-        appointmentTime: "",
+        appointmentTime: '',
         recordSelected: []
       }
     }
@@ -53,7 +55,7 @@ export default {
             'value-format': 'yyyy-MM-dd HH:mm:ss',
             'picker-options': {
               disabledDate: time => {
-                return time.getTime() < (Date.now() - 86400000)
+                return time.getTime() < Date.now() - 86400000
               }
             }
           },
@@ -62,7 +64,7 @@ export default {
             prop: 'appointmentTime',
             rules: this.formOptions.appointmentTime.isRules
           }
-        },
+        }
       ]
     },
     formOptions() {
@@ -71,9 +73,9 @@ export default {
           isEdit: true,
           isShow: true,
           isRules: [...required]
-        },
+        }
       }
-    },
+    }
   },
   methods: {
     allVerify() {
@@ -88,11 +90,11 @@ export default {
               type: 'success',
               message: '约单成功!'
             })
-            this.$emit("close")
+            this.$emit('close')
           })
         }
       })
-    },
+    }
   }
 }
 </script>
@@ -102,11 +104,11 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep &>.zj-page-fill-scroll {
+  ::v-deep & > .zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 
-    &>div:nth-child(1) {
+    & > div:nth-child(1) {
       margin-top: 20px;
     }
   }