no message

src/components/template/import_mixin.js

@@ -1,3 +1,20 @@
+function isObject(value) {
+  return value !== null && typeof value === 'object'
+}
+
+function isFunction(value) {
+  return typeof value === 'function'
+}
+
+function identifyType(value) {
+  if (isFunction(value)) {
+    return 'Function'
+  } else if (isObject(value)) {
+    return 'Object'
+  } else {
+    return 'Neither Object nor Function'
+  }
+}
 export default {
   methods: {
     //导入按钮
@@ -6,23 +23,34 @@ export default {
         <el-upload
           action={'_'}
           show-file-list={false}
-          http-request={data => {
-            const loading = this.$loading({
-              lock: true,
-              text: '正在导入',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            fun1 && fun1()
+          http-request={async data => {
             var formdata = new FormData()
             formdata.append('file', data.file)
-            if (!!params) {
+            if (identifyType(params) == 'Object') {
               for (const key in params) {
                 if (Object.hasOwnProperty.call(params, key)) {
                   formdata.append(key, params[key])
                 }
               }
+            } else if (identifyType(params) == 'Function') {
+              try {
+                var chanshu = await params()
+                for (const key in chanshu || {}) {
+                  if (Object.hasOwnProperty.call(chanshu, key)) {
+                    formdata.append(key, chanshu[key])
+                  }
+                }
+              } catch (error) {
+                return
+              }
             }
+            const loading = this.$loading({
+              lock: true,
+              text: '正在导入',
+              spinner: 'el-icon-loading',
+              background: 'rgba(0, 0, 0, 0.7)'
+            })
+            fun1 && fun1()
             func({ formdata })
               .then(res => {
                 fun2 && fun2(res)

src/utils/selectOptionWebsit.js

@@ -0,0 +1,84 @@
+import { getWebsit } from '@/api/customerManagement.js'
+
+export default function (pam = {}, option = [], placeholder = '请选择操作网点', errMsg = '请选择操作网点') {
+  return new Promise((r, j) => {
+    const h = this.$createElement
+    var _this = this
+    var done_ = null
+    function tanchuang() {
+      _this
+        .$msgbox({
+          title: placeholder,
+          message: h(
+            'el-select',
+            {
+              style: {
+                width: '100%'
+              },
+              props: {
+                value: '',
+                filterable: true,
+                clearable: true,
+                size: 'mini'
+              },
+              ref: 'selectView',
+              on: {
+                change: e => {
+                  _this.$refs.selectView.value = e
+                }
+              }
+            },
+            [
+              option.map(it => {
+                return h('el-option', {
+                  props: {
+                    key: it.websitId,
+                    label: it.name,
+                    value: it.websitId
+                  }
+                })
+              })
+            ]
+          ),
+          beforeClose: function (action, instance, done) {
+            if (action === 'confirm') {
+              if (_this?.$refs?.selectView?.value) {
+                done()
+              } else {
+                done_ = done
+                _this.$message({
+                  message: errMsg,
+                  type: 'warning'
+                })
+              }
+            } else {
+              done()
+            }
+          },
+          showCancelButton: true,
+          closeOnClickModal: false,
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        })
+        .then(_ => {
+          if (_this?.$refs?.selectView?.value) {
+            r(option?.find(item => item?.websitId === _this?.$refs?.selectView?.value))
+            done_?.()
+          } else {
+            j()
+          }
+        })
+        .catch(_ => {
+          j()
+        })
+    }
+    if (option && option.length) {
+      tanchuang()
+    } else {
+      getWebsit({ status: true, ...pam }).then(res => {
+        option = res.data
+        tanchuang()
+      })
+    }
+  })
+}

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -59,6 +59,7 @@ 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],
@@ -130,7 +131,16 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(settleExpenseImport, moduleName)
+                  return this.importButton(settleExpenseImport, moduleName, () => {
+                    return new Promise((r, j) => {
+                      selectOptionWebsit
+                        .bind(this)()
+                        .then(websit => {
+                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
+                        })
+                        .catch(j)
+                    })
+                  })
                 }
               }
             }),

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

@@ -645,6 +645,7 @@
 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,
@@ -1031,29 +1032,35 @@ export default {
 
       this.$refs.repairForm.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          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()
-            }
-          })
+          selectOptionWebsit
+            .bind(this)()
+            .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()
+                }
+              })
+            })
         }
       })
     },

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

@@ -9,32 +9,45 @@
 <script>
 import buttonMixin from './button_mixin.js'
 import { EventBus } from '@/utils/eventBus'
-import { orderBaseSave } from "@/api/workOrderPool.js"
+import { orderBaseSave } from '@/api/workOrderPool.js'
+import selectOptionWebsit from '@/utils/selectOptionWebsit.js'
 export default {
   mixins: [buttonMixin],
   methods: {
     save() {
-      this.acquireVerify(this, 'allVerify')((v) => {
+      this.acquireVerify(
+        this,
+        'allVerify'
+      )(v => {
         if (v) {
           this.lockBtn()
-          orderBaseSave(this.orderInfo).then(res => {
-            if (this.orderInfo.id) {
-              // 编辑保存后不跳转列表，刷新数据
-              this.acquireVerify(this, 'getorderDetail')()
-              // 刷新操作记录
-              this.acquireVerify(this, 'getOrderBaseLogList')()
-              this.$message({
-                type: 'success',
-                message: '保存成功'
+          selectOptionWebsit
+            .bind(this)()
+            .then(websit => {
+              orderBaseSave({
+                ...this.orderInfo,
+                ...{ createWebsitId: websit?.websitId, createWebsitName: websit?.name }
               })
-            } else {
-              // 创建保存后跳转列表
-              EventBus.$emit('handleOrderClone')
-            }
-            this.unlockBtn()
-          }).catch(() => {
-            this.unlockBtn()
-          })
+                .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,6 +8,7 @@
 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: {
@@ -19,20 +20,27 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          orderBaseReject({ orderBaseId: this.orderInfo.id })
-            .then(res => {
-              this.unlockBtn()
-              // 编辑保存后不跳转列表，刷新数据
-              this.acquireVerify(this, 'getorderDetail')()
-              // 刷新操作记录
-              this.acquireVerify(this, 'getOrderBaseLogList')()
-              this.$message({
-                type: 'success',
-                message: '驳回成功！'
+          selectOptionWebsit
+            .bind(this)()
+            .then(websit => {
+              orderBaseReject({
+                orderBaseId: this.orderInfo.id,
+                ...{ createWebsitId: websit?.websitId, createWebsitName: websit?.name }
               })
-            })
-            .catch(() => {
-              this.unlockBtn()
+                .then(res => {
+                  this.unlockBtn()
+                  // 编辑保存后不跳转列表，刷新数据
+                  this.acquireVerify(this, 'getorderDetail')()
+                  // 刷新操作记录
+                  this.acquireVerify(this, 'getOrderBaseLogList')()
+                  this.$message({
+                    type: 'success',
+                    message: '驳回成功！'
+                  })
+                })
+                .catch(() => {
+                  this.unlockBtn()
+                })
             })
         })
         .catch(() => {

src/views/workOrder/workOrderPool/index.vue

@@ -86,6 +86,7 @@ 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,
@@ -197,7 +198,16 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(orderBaseImport, moduleName)
+                  return this.importButton(orderBaseImport, moduleName, () => {
+                    return new Promise((r, j) => {
+                      selectOptionWebsit
+                        .bind(this)()
+                        .then(websit => {
+                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
+                        })
+                        .catch(j)
+                    })
+                  })
                 }
               }
             }),
@@ -219,7 +229,16 @@ export default {
               return {
                 name: moduleName,
                 render: () => {
-                  return this.importButton(orderBaseImport2, moduleName)
+                  return this.importButton(orderBaseImport2, moduleName, () => {
+                    return new Promise((r, j) => {
+                      selectOptionWebsit
+                        .bind(this)()
+                        .then(websit => {
+                          r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
+                        })
+                        .catch(j)
+                    })
+                  })
                 }
               }
             }),