linwenxin пре 1 година
родитељ
комит
a51b56894a
1 измењених фајлова са 20 додато и 13 уклоњено
  1. 20 13
      src/views/workOrder/workOrderPool/index.vue

+ 20 - 13
src/views/workOrder/workOrderPool/index.vue

@@ -7,7 +7,7 @@
     <!-- 创建工单 -->
     <div class="cartographer_big">
       <el-dialog title="创建工单" width="100%" :modal="false" :visible.sync="createFormBool" :before-close="handleClose">
-        <workOrderInfo :workOrderType="workOrderType" v-if="createFormBool" :cloneWorkOrder="cloneWorkOrder"/>
+        <workOrderInfo :workOrderType="workOrderType" v-if="createFormBool" :cloneWorkOrder="cloneWorkOrder" />
       </el-dialog>
     </div>
     <!-- 工单详情 -->
@@ -19,7 +19,8 @@
     </div>
     <!-- 批量预约/改约 -->
     <div class="cartographer_big">
-      <el-dialog title="批量约单" width="100%" :modal="false" :visible.sync="rescheduleBool" :before-close="rescheduleClose">
+      <el-dialog title="批量约单" width="100%" :modal="false" :visible.sync="rescheduleBool"
+        :before-close="rescheduleClose">
         <Reschedule v-if="rescheduleBool" :recordSelected="recordSelected" @close="rescheduleClose" />
       </el-dialog>
     </div>
@@ -89,7 +90,7 @@ export default {
       return [
         {
           name: '工单类型',
-          key: 'orderSmallType',
+          key: 'orderSmallTypeText',
           value: '',
           conditions: [{
             label: "全部",
@@ -223,7 +224,7 @@ export default {
       this.handleClose()
     })
     EventBus.$on('cloneWorkOrder', (data) => {
-      this.handleClose(()=>{
+      this.handleClose(() => {
         this.cloneWorkOrder = data
         this.workOrderType = data.saleType
         this.createFormBool = false
@@ -234,10 +235,16 @@ export default {
     })
     // 获取工单类型
     listPageV2({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "true" }] }).then(res => {
-      this.orderTypeList = res.data.records.map(item => ({
-        value: item.id,
-        label: item.orderSmallTypeText
-      }))
+      var obj = {}
+      res.data.records.map(item => {
+        if (!obj[item.orderSmallTypeText]) {
+          obj[item.orderSmallTypeText] = ({
+            value: item.orderSmallTypeText,
+            label: item.orderSmallTypeText
+          })
+        }
+      })
+      this.orderTypeList = Object.values(obj)
     })
   },
   methods: {
@@ -336,15 +343,15 @@ export default {
         if (pam.orderStatus) {
           pam.params.push({ "param": "a.order_status", "compare": "=", "value": pam.orderStatus })
         }
-        if (pam.orderSmallType) {
-          pam.params.push({ "param": "a.order_small_type", "compare": "=", "value": pam.orderSmallType })
+        if (pam.orderSmallTypeText) {
+          pam.params.push({ "param": "a.order_small_type_text", "compare": "=", "value": pam.orderSmallTypeText })
         }
         cb && cb(pam)
         return orderBaseList(pam)
       } catch (err) {
       } finally {
         this.$nextTick(() => {
-          this.getOrderBaseStatusCount({ orderSmallType: pam.orderSmallType || "" })
+          this.getOrderBaseStatusCount({ orderSmallTypeText: pam.orderSmallTypeText || "" })
         })
       }
     },
@@ -362,7 +369,7 @@ export default {
         edit: {
           click: ({ row, index, column }) => {
             this.id = row.id
-            this.workOrderType = Number(Object.entries(row?.selectMapData?.saleType||{}).find(([key, val]) => val == row.saleType)?.[0] || 1)
+            this.workOrderType = Number(Object.entries(row?.selectMapData?.saleType || {}).find(([key, val]) => val == row.saleType)?.[0] || 1)
             this.$nextTick(() => {
               this.detailFormBool = true
             })
@@ -383,7 +390,7 @@ export default {
         this.detailFormBool = false
         this.recordSelected = []
         this.$refs?.pageRef?.refreshList()
-        if(cb && typeof cb === 'function'){
+        if (cb && typeof cb === 'function') {
           cb()
         }
       })