no message

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -59,7 +59,6 @@ import {
 } from '@/api/costPerDimension'
 import { commonTemplateDownload } from '@/api/common.js'
 import { memberListPageV2 } from '@/api/masterManagement'
-import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 export default {
   components: { TemplatePage, ImageUpload },
   mixins: [import_mixin, operation_mixin],
@@ -131,15 +130,7 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(settleExpenseImport, moduleName, () => {
-                    return new Promise((r, j) => {
-                      selectOptionWebsit()
-                        .then(websit => {
-                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
-                        })
-                        .catch(j)
-                    })
-                  })
+                  return this.importButton(settleExpenseImport, moduleName)
                 }
               }
             }),

src/views/mallManagement/tenancyManagement/tenancyOrder/detail.vue

@@ -645,7 +645,6 @@
 import { lbsAmapRegion } from '@/api/common.js'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
 import ImageUpload from '@/components/file-upload'
-import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 import {
   getGoods,
   getDetail,
@@ -1032,32 +1031,28 @@ export default {
 
       this.$refs.repairForm.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          selectOptionWebsit().then(websit => {
-            confirmRepair({
-              createWebsitId: websit?.websitId,
-              createWebsitName: websit?.name,
-              companyWechatId: this.formData.companyWechatId,
-              appointmentTime: this.repairForm.date + ' 00:00:00',
-              saleOrderId: this.id,
-              orderSmallType: this.typeId,
-              province: this.formData.province,
-              provinceId: this.formData.provinceId,
-              city: this.formData.city,
-              cityId: this.formData.cityId,
-              area: this.formData.area,
-              areaId: this.formData.areaId,
-              street: this.formData.street,
-              streetId: this.formData.streetId,
-              address: this.formData.address,
-              orderProducts: productList,
-              isZl: true
-            }).then(res => {
-              if (res.code == 200) {
-                this.isRepair = false
-                this.$message.success('报修成功！')
-                this.getDetail()
-              }
-            })
+          confirmRepair({
+            companyWechatId: this.formData.companyWechatId,
+            appointmentTime: this.repairForm.date + ' 00:00:00',
+            saleOrderId: this.id,
+            orderSmallType: this.typeId,
+            province: this.formData.province,
+            provinceId: this.formData.provinceId,
+            city: this.formData.city,
+            cityId: this.formData.cityId,
+            area: this.formData.area,
+            areaId: this.formData.areaId,
+            street: this.formData.street,
+            streetId: this.formData.streetId,
+            address: this.formData.address,
+            orderProducts: productList,
+            isZl: true
+          }).then(res => {
+            if (res.code == 200) {
+              this.isRepair = false
+              this.$message.success('报修成功！')
+              this.getDetail()
+            }
           })
         }
       })

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/buttons/commitSave.vue

@@ -10,7 +10,6 @@
 import buttonMixin from './button_mixin.js'
 import { EventBus } from '@/utils/eventBus'
 import { orderBaseSave } from '@/api/workOrderPool.js'
-import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 export default {
   mixins: [buttonMixin],
   methods: {
@@ -21,31 +20,28 @@ export default {
       )(v => {
         if (v) {
           this.lockBtn()
-          selectOptionWebsit().then(websit => {
-            orderBaseSave({
-              ...this.orderInfo,
-              ...{ createWebsitId: websit?.websitId, createWebsitName: websit?.name }
-            })
-              .then(res => {
-                if (this.orderInfo.id) {
-                  // 编辑保存后不跳转列表，刷新数据
-                  this.acquireVerify(this, 'getorderDetail')()
-                  // 刷新操作记录
-                  this.acquireVerify(this, 'getOrderBaseLogList')()
-                  this.$message({
-                    type: 'success',
-                    message: '保存成功'
-                  })
-                } else {
-                  // 创建保存后跳转列表
-                  EventBus.$emit('handleOrderClone')
-                }
-                this.unlockBtn()
-              })
-              .catch(() => {
-                this.unlockBtn()
-              })
+          orderBaseSave({
+            ...this.orderInfo
           })
+            .then(res => {
+              if (this.orderInfo.id) {
+                // 编辑保存后不跳转列表，刷新数据
+                this.acquireVerify(this, 'getorderDetail')()
+                // 刷新操作记录
+                this.acquireVerify(this, 'getOrderBaseLogList')()
+                this.$message({
+                  type: 'success',
+                  message: '保存成功'
+                })
+              } else {
+                // 创建保存后跳转列表
+                EventBus.$emit('handleOrderClone')
+              }
+              this.unlockBtn()
+            })
+            .catch(() => {
+              this.unlockBtn()
+            })
         }
       })
     }

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/buttons/orderReject.vue

@@ -8,7 +8,6 @@
 import buttonMixin from './button_mixin.js'
 import { MessageBox } from '@zjlib/element-ui2'
 import { orderBaseReject } from '@/api/workOrderPool.js'
-import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 export default {
   mixins: [buttonMixin],
   methods: {
@@ -20,26 +19,23 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          selectOptionWebsit().then(websit => {
-            orderBaseReject({
-              orderBaseId: this.orderInfo.id,
-              ...{ createWebsitId: websit?.websitId, createWebsitName: websit?.name }
-            })
-              .then(res => {
-                this.unlockBtn()
-                // 编辑保存后不跳转列表，刷新数据
-                this.acquireVerify(this, 'getorderDetail')()
-                // 刷新操作记录
-                this.acquireVerify(this, 'getOrderBaseLogList')()
-                this.$message({
-                  type: 'success',
-                  message: '驳回成功！'
-                })
-              })
-              .catch(() => {
-                this.unlockBtn()
-              })
+          orderBaseReject({
+            orderBaseId: this.orderInfo.id
           })
+            .then(res => {
+              this.unlockBtn()
+              // 编辑保存后不跳转列表，刷新数据
+              this.acquireVerify(this, 'getorderDetail')()
+              // 刷新操作记录
+              this.acquireVerify(this, 'getOrderBaseLogList')()
+              this.$message({
+                type: 'success',
+                message: '驳回成功！'
+              })
+            })
+            .catch(() => {
+              this.unlockBtn()
+            })
         })
         .catch(() => {
           this.unlockBtn()

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/serviceInfo.js

@@ -1,18 +1,46 @@
 import { listPageV2 } from '@/api/workOrder/orderType'
 import { getDataDictionary } from '@/api/dataDictionary.js'
+import { getWebsit } from '@/api/customerManagement.js'
 
 export default {
   data() {
     return {
       orderSmallTypeData: [],
       orderChannels: [],
-      WORKER_ORDER_SOURCE: []
+      WORKER_ORDER_SOURCE: [],
+      createWebsitList: []
     }
   },
   computed: {
     serviceInfo() {
       return [
         {
+          isShow: this.formOptions.createWebsitId.isShow,
+          name: 'el-select',
+          md: 6,
+          options: this.createWebsitList,
+          attributes: {
+            disabled: !this.formOptions.createWebsitId.isEdit,
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true
+          },
+          formItemAttributes: {
+            label: '创建网点',
+            prop: 'createWebsitId',
+            rules: this.formOptions.createWebsitId.isRules
+          },
+          events: {
+            change: val => {
+              if (val) {
+                this.orderInfo.createWebsitName = this.createWebsitList.find(item => item.value == val).label
+              } else {
+                this.orderInfo.createWebsitName = ''
+              }
+            }
+          }
+        },
+        {
           isShow: this.formOptions.serviceStatus.isShow,
           name: 'el-input',
           md: 6,
@@ -495,5 +523,13 @@ export default {
         label: item.dictValue
       }))
     })
+
+    getWebsit({ status: true }).then(res => {
+      this.createWebsitList = res.data.map(item => ({
+        value: item.websitId,
+        label: item.name
+      }))
+      console.log(this.createWebsitList)
+    })
   }
 }

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -38,6 +38,7 @@ var initdata_ = {
   // 详细地址
   address: '',
   // 服务信息--------------------------------
+  createWebsitId: '',
   // 工单类型
   orderSmallType: '',
   // 工单来源
@@ -288,6 +289,11 @@ export default {
           isRules: []
         },
         // 服务信息--------------------------------
+        createWebsitId: {
+          isEdit: notNewOrder,
+          isShow: true,
+          isRules: [...required]
+        },
         // 工单类型
         orderSmallType: {
           isEdit: isThreeOrder && notNewOrder,

src/views/workOrder/workOrderPool/index.vue

@@ -112,7 +112,6 @@ import Reassignment from './components/reassignment/index.vue'
 import Reschedule from './components/reschedule/index.vue'
 import { commonTemplateDownload } from '@/api/common.js'
 import orderListColumn from '@/mixin/orderListColumn'
-import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 export default {
   components: {
     TemplatePage,
@@ -234,15 +233,7 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(orderBaseImport3, moduleName, () => {
-                    return new Promise((r, j) => {
-                      selectOptionWebsit()
-                        .then(websit => {
-                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
-                        })
-                        .catch(j)
-                    })
-                  })
+                  return this.importButton(orderBaseImport3, moduleName)
                 }
               }
             }),
@@ -250,15 +241,7 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(orderBaseImport, moduleName, () => {
-                    return new Promise((r, j) => {
-                      selectOptionWebsit()
-                        .then(websit => {
-                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
-                        })
-                        .catch(j)
-                    })
-                  })
+                  return this.importButton(orderBaseImport, moduleName)
                 }
               }
             }),
@@ -280,15 +263,7 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(orderBaseImport2, moduleName, () => {
-                    return new Promise((r, j) => {
-                      selectOptionWebsit()
-                        .then(websit => {
-                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
-                        })
-                        .catch(j)
-                    })
-                  })
+                  return this.importButton(orderBaseImport2, moduleName)
                 }
               }
             }),