no message

package-lock.json

@@ -24992,6 +24992,11 @@
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
+    "vue-i18n": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.2.1.tgz",
+      "integrity": "sha512-eiqkUBP9uoADmHa1vz0jLS/JNvR+dODjn2nz14/ZD14hTaWpbOXoUZ0C5Nd2vbP6vOaxXjmkvkzJn/VISvX1BQ=="
+    },
     "vue-jest": {
       "version": "3.0.7",
       "resolved": "https://registry.npmmirror.com/vue-jest/-/vue-jest-3.0.7.tgz",

package.json

@@ -50,6 +50,7 @@
     "v-socket-io-plugins": "^1.0.8",
     "vue": "2.6.10",
     "vue-demi": "^0.14.5",
+    "vue-i18n": "^8.2.1",
     "vue-ls": "^4.0.0",
     "vue-plugin-hiprint": "0.0.56",
     "vue-quill-editor": "^3.0.6",

src/api/streetConfiguration.js

@@ -27,3 +27,68 @@ export function dispatchDelDispatch(params) {
 export function dispatchImport(data) {
   return handleImport('/dispatch/import', data.formdata, data.id || '')
 }
+
+export function dispatchPList(data) {
+  return request({
+    url: '/dispatch/pList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchCList(data) {
+  return request({
+    url: '/dispatch/cList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchAList(data) {
+  return request({
+    url: '/dispatch/aList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchSList(data) {
+  return request({
+    url: '/dispatch/sList',
+    method: 'post',
+    data
+  })
+}
+//
+export function dispatchChannel(data) {
+  return request({
+    url: '/dispatch/channel',
+    method: 'post',
+    data
+  })
+}
+export function dispatchSmallList(data) {
+  return request({
+    url: '/dispatch/smallList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchCategoryList(data) {
+  return request({
+    url: '/dispatch/categoryList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchSourceList(data) {
+  return request({
+    url: '/dispatch/sourceList',
+    method: 'post',
+    data
+  })
+}
+export function dispatchSaveDispatch(data) {
+  return request({
+    url: '/dispatch/saveDispatch',
+    method: 'post',
+    data
+  })
+}

src/global-text-processor.js

@@ -0,0 +1,25 @@
+export default {
+  install(Vue) {
+    Vue.mixin({
+      updated() {
+        this.$nextTick(() => {
+          this.processTextNodes(this.$el)
+        })
+      },
+      methods: {
+        processTextNodes(el) {
+          // 遍历子节点并处理文本内容
+          if (el.nodeType === Node.ELEMENT_NODE) {
+            Array.from(el.childNodes).forEach(child => {
+              if (child.nodeType === Node.TEXT_NODE) {
+                child.textContent = this.$i18n.t(child.textContent.trim())
+              } else {
+                this.processTextNodes(child)
+              }
+            })
+          }
+        }
+      }
+    })
+  }
+}

src/main.js

@@ -6,6 +6,18 @@ if (getUrlParam().token) {
 import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import './plugins/jquery.hiwprint.js'
+
+// import VueI18n from 'vue-i18n'
+// import GlobalTextProcessor from './global-text-processor' // 导入插件
+
+// Vue.use(VueI18n)
+// Vue.use(GlobalTextProcessor) // 注册插件
+
+// const i18n = new VueI18n({
+//   locale: 'ar'
+//   // messages
+// })
+
 import ElementUI from '@zjlib/element-ui2'
 import '@zjlib/element-ui2/lib/theme-chalk/index.css'
 import VueQuillEditor from 'vue-quill-editor'
@@ -206,5 +218,6 @@ new Vue({
   el: '#app',
   router,
   store,
+  // i18n,
   render: h => h(App)
 })

src/views/workOrder/automaticDispatchConfig/streetConfiguration/index.vue

@@ -36,6 +36,24 @@
       :exportList="exportList"
     >
     </template-page>
+    <div class="cartographer_big">
+      <el-dialog title="配置" width="100%" :modal="false" :visible.sync="formDialog" :before-close="formDialogClose">
+        <zj-page-container v-if="formDialog">
+          <zj-page-fill class="neibuview">
+            <zj-form-container ref="formRef" :form-data="formData" :form-attributes="{ size: 'mini' }">
+              <zj-form-module title="配置信息" label-width="90px" :form-data="formData" :form-items="formItems">
+              </zj-form-module>
+            </zj-form-container>
+          </zj-page-fill>
+          <div>
+            <div style="box-sizing: border-box; padding: 10px">
+              <el-button size="mini" @click="formDialogClose">关闭</el-button>
+              <el-button size="mini" type="primary" @click="queding">确定</el-button>
+            </div>
+          </div>
+        </zj-page-container>
+      </el-dialog>
+    </div>
   </zj-page-container>
 </template>
 
@@ -45,12 +63,22 @@ import {
   dispatchListDispatch,
   dispatchListDispatchExport,
   dispatchDelDispatch,
-  dispatchImport
+  dispatchImport,
+  dispatchPList,
+  dispatchCList,
+  dispatchAList,
+  dispatchSList,
+  dispatchChannel,
+  dispatchSmallList,
+  dispatchCategoryList,
+  dispatchSourceList,
+  dispatchSaveDispatch
 } from '@/api/streetConfiguration.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
 import import_mixin from '@/components/template/import_mixin.js'
 import { getDepartmentList } from '@/api/setting'
 import { commonTemplateDownload } from '@/api/common.js'
+import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
 export default {
   components: {
     TemplatePage
@@ -69,7 +97,33 @@ export default {
         children: 'children',
         label: 'name'
       },
-      filterText: ''
+      filterText: '',
+      dataList: [],
+      provinceList: [],
+      cityList: [],
+      areaList: [],
+      streetList: [],
+      orderSourceIdsList: [],
+      orderSmallIdsList: [],
+      orderChannelIdsList: [],
+      categoryIdsList: [],
+      formData: {
+        provinceCode: '',
+        provinceName: '',
+        cityCode: '',
+        cityName: '',
+        areaCode: '',
+        areaName: '',
+        streetCode: '',
+        streetName: '',
+        categoryIds: [],
+        orderChannelIds: [],
+        orderSmallIds: [],
+        orderSourceIds: [],
+        websitId: '',
+        websitName: ''
+      },
+      formDialog: false
     }
   },
   mounted() {
@@ -82,7 +136,9 @@ export default {
         [
           [
             this.optionsEvensAuth('add', {
-              click: () => {}
+              click: () => {
+                this.formDialog = true
+              }
             })
           ],
           [
@@ -113,6 +169,266 @@ export default {
           ]
         ]
       ]
+    },
+    formItems() {
+      return [
+        {
+          name: 'el-select',
+          md: 6,
+          options: this.dataList,
+          attributes: {
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true
+          },
+          formItemAttributes: {
+            label: '选择网点',
+            prop: 'websitId',
+            rules: [...required]
+          },
+          events: {
+            change: val => {
+              if (val) {
+                this.formData.websitName = this.dataList.find(item => item.value == val).label
+              } else {
+                this.formData.websitName = ''
+              }
+            }
+          }
+        },
+        {
+          name: 'el-select',
+          md: 6,
+          formItemAttributes: {
+            label: '选择省份', //省
+            prop: 'provinceCode',
+            rules: [...required],
+            errLabel: '省'
+          },
+          options: this.provinceList,
+          attributes: {
+            clearable: true,
+            filterable: true,
+            placeholder: '请选择',
+            loading: !this.provinceList.length
+          },
+          events: {
+            focus: val => {
+              dispatchPList(this.getPam('provinceCode')).then(res => {
+                this.provinceList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            },
+            change: val => {
+              // 获取省名称
+              this.formData.provinceName = this.provinceList?.find(item => item.value === val)?.label || ''
+            }
+          }
+        },
+        {
+          name: 'el-select',
+          md: 6,
+          formItemAttributes: {
+            label: '选择城市', //市
+            prop: 'cityCode',
+            rules: [...required],
+            errLabel: '市'
+          },
+          options: this.cityList,
+          attributes: {
+            clearable: true,
+            filterable: true,
+            placeholder: '请选择',
+            loading: !this.cityList.length
+          },
+          events: {
+            focus: val => {
+              dispatchCList(this.getPam('cityCode')).then(res => {
+                this.cityList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            },
+            change: val => {
+              // 获取市名称
+              this.formData.cityName = this.cityList?.find(item => item.value === val)?.label || ''
+            }
+          }
+        },
+        {
+          name: 'el-select',
+          md: 6,
+          formItemAttributes: {
+            label: '选择区域', //区
+            prop: 'areaCode',
+            rules: [...required],
+            errLabel: '区'
+          },
+          options: this.areaList,
+          attributes: {
+            clearable: true,
+            filterable: true,
+            placeholder: '请选择',
+            loading: !this.areaList.length
+          },
+          events: {
+            focus: val => {
+              dispatchAList(this.getPam('areaCode')).then(res => {
+                this.areaList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            },
+            change: val => {
+              // 获取区名称
+              this.formData.areaName = this.areaList?.find(item => item.value === val)?.label || ''
+            }
+          }
+        },
+        {
+          name: 'el-select',
+          md: 6,
+          formItemAttributes: {
+            label: '选择街道', //街道
+            prop: 'streetCode',
+            rules: [...required],
+            errLabel: '街道'
+          },
+          options: this.streetList,
+          attributes: {
+            clearable: true,
+            filterable: true,
+            placeholder: '请选择',
+            loading: !this.streetList.length
+          },
+          events: {
+            focus: val => {
+              dispatchSList(this.getPam('streetCode')).then(res => {
+                this.streetList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            },
+            change: val => {
+              // 获取街道名称
+              this.formData.streetName = this.streetList?.find(item => item.value === val)?.label || ''
+            }
+          }
+        },
+        {
+          name: 'zj-paging-pull-down',
+          options: this.orderChannelIdsList,
+          md: 24,
+          attributes: {
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true,
+            multiple: true,
+            loading: !this.orderChannelIdsList.length
+          },
+          formItemAttributes: {
+            label: '工单渠道',
+            prop: 'orderChannelIds',
+            rules: [...required]
+          },
+          events: {
+            focus: val => {
+              dispatchChannel(this.getPam('orderChannelIds')).then(res => {
+                this.orderChannelIdsList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            }
+          }
+        },
+        {
+          name: 'zj-paging-pull-down',
+          options: this.orderSmallIdsList,
+          md: 24,
+          attributes: {
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true,
+            multiple: true,
+            loading: !this.orderSmallIdsList.length
+          },
+          formItemAttributes: {
+            label: '工单类型',
+            prop: 'orderSmallIds',
+            rules: [...required]
+          },
+          events: {
+            focus: val => {
+              dispatchSmallList(this.getPam('orderSmallIds')).then(res => {
+                this.orderSmallIdsList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            }
+          }
+        },
+        {
+          name: 'zj-paging-pull-down',
+          options: this.categoryIdsList,
+          md: 24,
+          attributes: {
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true,
+            multiple: true,
+            loading: !this.categoryIdsList.length
+          },
+          formItemAttributes: {
+            label: '产品大类',
+            prop: 'categoryIds',
+            rules: [...required]
+          },
+          events: {
+            focus: val => {
+              dispatchCategoryList(this.getPam('categoryIds')).then(res => {
+                this.categoryIdsList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            }
+          }
+        },
+        {
+          name: 'zj-paging-pull-down',
+          options: this.orderSourceIdsList,
+          md: 24,
+          attributes: {
+            placeholder: '请选择',
+            clearable: true,
+            filterable: true,
+            multiple: true,
+            loading: !this.orderSourceIdsList.length
+          },
+          formItemAttributes: {
+            label: '工单来源',
+            prop: 'orderSourceIds',
+            rules: [...required]
+          },
+          events: {
+            focus: val => {
+              dispatchSourceList(this.getPam('orderSourceIds')).then(res => {
+                this.orderSourceIdsList = res.data.map(item => ({
+                  value: item.keyId,
+                  label: item.valueName
+                }))
+              })
+            }
+          }
+        }
+      ]
     }
   },
   watch: {
@@ -127,9 +443,27 @@ export default {
     },
     // 请求属性数据
     getTreeListData() {
+      var list_ = []
+      function dg(list, pname = []) {
+        for (let { children, name, ...item } of list) {
+          list_.push({ ...item, name: name, pname: [...pname] })
+          if (children && children.length) dg(children, [...pname, name])
+        }
+      }
       getDepartmentList().then(res => {
         this.treeList = res.data
         this.$refs.pageRef.refreshList()
+        dg(JSON.parse(JSON.stringify(res.data)))
+        this.dataList = [...list_]
+          .filter(item => {
+            return item.type === 'C'
+          })
+          .map(item => {
+            return {
+              label: item.name,
+              value: item.websitId
+            }
+          })
       })
     },
     // 树形选中
@@ -151,9 +485,9 @@ export default {
     },
     operation() {
       return this.operationBtn({
-        edit: {
-          click: ({ row, index, column }) => {}
-        },
+        // edit: {
+        //   click: ({ row, index, column }) => {}
+        // },
         del: {
           prompt: '请确认是否删除该数据, 是否继续?',
           click: ({ row, index, column }) => {
@@ -170,6 +504,64 @@ export default {
           }
         }
       })
+    },
+    getPam(key) {
+      var keys = [
+        'provinceCode',
+        'cityCode',
+        'areaCode',
+        'streetCode',
+        'dictCode',
+        'categoryId',
+        'orderSmallId',
+        'orderSourceId'
+      ].filter(k => k !== key)
+      var obj = {}
+      keys.map(k => {
+        if (this.formData[k]) {
+          obj[k] = this.formData[k]
+        }
+      })
+      // console.
+      return obj
+    },
+    formDialogClose() {
+      // this.provinceList: [],
+      // cityList: [],
+      // areaList: [],
+      // streetList: [],
+      this.formData = {
+        provinceCode: '',
+        provinceName: '',
+        cityCode: '',
+        cityName: '',
+        areaCode: '',
+        areaName: '',
+        streetCode: '',
+        streetName: '',
+        categoryId: '',
+        categoryName: '',
+        dictCode: '',
+        dictValue: '',
+        orderSmallId: '',
+        orderSmallTypeText: '',
+        orderSource: '',
+        orderSourceId: '',
+        websitId: '',
+        websitName: ''
+      }
+      this.formDialog = false
+    },
+    queding() {
+      this.$refs.formRef.validate(valid => {
+        if (valid) {
+          dispatchSaveDispatch(this.formData).then(res => {
+            this.$message({ type: 'success', message: `配置成功!` })
+            this.$refs.pageRef.refreshList()
+            this.formDialogClose()
+          })
+        }
+      })
     }
   }
 }
@@ -192,4 +584,17 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.neibuview {
+  box-sizing: border-box;
+  padding-left: 16px;
+
+  ::v-deep & > .zj-page-fill-scroll {
+    box-sizing: border-box;
+    padding-right: 16px;
+
+    & > div:nth-child(1) {
+      margin-top: 20px;
+    }
+  }
+}
 </style>

src/views/workOrder/automaticDispatchConfig/unallocatedStreet/index.vue

@@ -182,7 +182,7 @@ export default {
             filterable: true
           },
           formItemAttributes: {
-            label: '工单类型',
+            label: '网点',
             prop: 'websitId',
             rules: [...required]
           },
@@ -259,7 +259,7 @@ export default {
     queding() {
       this.$refs.formRef.validate(valid => {
         if (valid) {
-          this.dispatchSave(this.formData).then(res => {
+          dispatchSave(this.formData).then(res => {
             this.$message({ type: 'success', message: `配置成功!` })
             this.$refs.pageRef.refreshList()
             this.formDialogClose()