no message

src/App.vue

@@ -5,10 +5,16 @@
 </template>
 
 <script>
+import { setAppVueThis } from '@/utils/selectOptionWebsit.js'
 export default {
   name: 'App',
   data() {
-    return {}
+    return {
+      selectOptionWebsitVal: ''
+    }
+  },
+  created() {
+    setAppVueThis(this)
   },
   methods: {}
 }

src/utils/selectOptionWebsit.js

@@ -1,68 +1,78 @@
 import { getWebsit } from '@/api/customerManagement.js'
 
+var AppVueThis = null
+
+export function setAppVueThis(e) {
+  console.log(e, 'lllllllllllllllllllllll')
+  AppVueThis = e
+}
+
 export default function (pam = {}, option = [], placeholder = '请选择操作网点', errMsg = '请选择操作网点') {
   return new Promise((r, j) => {
-    const h = this.$createElement
-    var _this = this
+    console.log(AppVueThis)
+    if (!AppVueThis) {
+      j({})
+      return
+    }
+    const h = AppVueThis.$createElement
     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
-                }
-              }
+      AppVueThis.$msgbox({
+        title: placeholder,
+        message: h(
+          'el-select',
+          {
+            style: {
+              width: '100%'
             },
-            [
-              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'
-                })
+            props: {
+              value: '',
+              filterable: true,
+              clearable: true,
+              size: 'mini'
+            },
+            ref: 'selectView',
+            on: {
+              change: e => {
+                AppVueThis.$refs.selectView.value = e
               }
-            } else {
-              done()
             }
           },
-          showCancelButton: true,
-          closeOnClickModal: false,
-          confirmButtonText: '确定',
-          cancelButtonText: '取消'
-        })
+          [
+            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 (AppVueThis?.$refs?.selectView?.value) {
+              done()
+            } else {
+              done_ = done
+              AppVueThis.$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))
+          if (AppVueThis?.$refs?.selectView?.value) {
+            r(option?.find(item => item?.websitId === AppVueThis?.$refs?.selectView?.value))
             done_?.()
           } else {
             j()

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -133,8 +133,7 @@ export default {
                 render: () => {
                   return this.importButton(settleExpenseImport, moduleName, () => {
                     return new Promise((r, j) => {
-                      selectOptionWebsit
-                        .bind(this)()
+                      selectOptionWebsit()
                         .then(websit => {
                           r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
                         })

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

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

src/views/setting/account/index.vue

@@ -453,7 +453,11 @@ export default {
       const result = await new Promise((resolve, reject) => {
         adminDeptTreeWebsit()
           .then(res => {
-            resolve(res.data)
+            var list = res.data
+            if (JSON.parse(localStorage.getItem('greemall_user'))?.type != 2) {
+              list = list?.[0]?.children
+            }
+            resolve(list)
           })
           .catch(res => {
             resolve([])

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

@@ -21,33 +21,31 @@ export default {
       )(v => {
         if (v) {
           this.lockBtn()
-          selectOptionWebsit
-            .bind(this)()
-            .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()
-                })
+          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()
+              })
+          })
         }
       })
     }

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

@@ -20,28 +20,26 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          selectOptionWebsit
-            .bind(this)()
-            .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()
-                })
+          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()
+              })
+          })
         })
         .catch(() => {
           this.unlockBtn()

src/views/workOrder/workOrderPool/index.vue

@@ -200,8 +200,7 @@ export default {
                 render: () => {
                   return this.importButton(orderBaseImport, moduleName, () => {
                     return new Promise((r, j) => {
-                      selectOptionWebsit
-                        .bind(this)()
+                      selectOptionWebsit()
                         .then(websit => {
                           r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
                         })
@@ -231,8 +230,7 @@ export default {
                 render: () => {
                   return this.importButton(orderBaseImport2, moduleName, () => {
                     return new Promise((r, j) => {
-                      selectOptionWebsit
-                        .bind(this)()
+                      selectOptionWebsit()
                         .then(websit => {
                           r({ createWebsitId: websit?.websitId, createWebsitName: websit?.name })
                         })