no message

src/api/networkNotification.js

@@ -0,0 +1,57 @@
+import request, { postBlob, getBlob, handleImport } from '@/utils/request'
+
+export function noticeWebsitList(data) {
+  return request({
+    url: `/noticeWebsit/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticeWebsitListExport(data) {
+  return request({
+    url: `/noticeWebsit/list/export?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticeWebsitAdd(data) {
+  return request({
+    url: `/noticeWebsit/add`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticeWebsitUpdate(data) {
+  return request({
+    url: `/noticeWebsit/update`,
+    method: 'post',
+    data
+  })
+}
+
+export function noticeWebsitDetail(params) {
+  return request({
+    url: `/noticeWebsit/detail`,
+    method: 'get',
+    params
+  })
+}
+
+export function noticeWebsitOfOrSend(params) {
+  return request({
+    url: `/noticeWebsit/ofOrSend`,
+    method: 'post',
+    params
+  })
+}
+
+export function noticeWebsitListWebsit(data) {
+  return request({
+    url: `/noticeWebsit/listWebsit?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}

src/api/settlementDataImport.js

@@ -10,7 +10,7 @@ export function dailySummaryList(data) {
 
 export function dailySummaryRepairDetailList(data) {
   return request({
-    url: `/daily/summary/repair/detail/list?moduleId=${data.moduleId}22`,
+    url: `/daily/summary/repair/detail/list?moduleId=${data.moduleId}`,
     method: 'post',
     data
   })

src/api/streetConfiguration.js

@@ -35,6 +35,13 @@ export function dispatchPList(data) {
     data
   })
 }
+export function dispatchSalesList(data) {
+  return request({
+    url: '/dispatch/salesList',
+    method: 'post',
+    data
+  })
+}
 export function dispatchCList(data) {
   return request({
     url: '/dispatch/cList',

src/views/setting/notification/networkNotification/index.vue

@@ -0,0 +1,422 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :getList="getList"
+    :exportList="exportList"
+    :columnParsing="columnParsing"
+    :optionsEvensGroup="optionsEvensGroup"
+    :tableAttributes="tableAttributes"
+    :tableEvents="tableEvents"
+    :operation="operation()"
+  >
+    <div class="cartographer_big">
+      <el-dialog title="配置" width="100%" :modal="false" :visible.sync="formBool" :before-close="handleClose">
+        <zj-page-container v-if="formBool">
+          <zj-page-fill class="neibuview">
+            <zj-form-container
+              ref="formRef"
+              :form-data="formData"
+              :form-rules="formRules"
+              :form-attributes="{ size: 'mini' }"
+            >
+              <zj-form-module title="基础信息" :form-data="formData" :form-items="items" />
+              <zj-form-module title="网点信息" :form-data="formData" :form-items="items2" />
+            </zj-form-container>
+          </zj-page-fill>
+          <!-- 操作按钮 -->
+          <div style="box-sizing: border-box; padding: 10px; text-align: right">
+            <el-button size="mini" @click="handleClose">取 消</el-button>
+            <el-button v-if="~[0, 1].indexOf(formType)" size="mini" @click="formConfirm" type="primary"
+              >发 送</el-button
+            >
+          </div>
+        </zj-page-container>
+      </el-dialog>
+    </div>
+  </template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import pagingTransfer from '@/components/paging-transfer.vue'
+import {
+  noticeWebsitList,
+  noticeWebsitListExport,
+  noticeWebsitAdd,
+  noticeWebsitUpdate,
+  noticeWebsitDetail,
+  noticeWebsitOfOrSend
+} from '@/api/networkNotification'
+import operation_mixin from '@/components/template/operation_mixin.js'
+import { required } from '@/components/template/rules_verify.js'
+import { getWebsit } from '@/api/customerManagement.js'
+import { EventBus } from '@/utils/eventBus'
+import ImageUpload from '@/components/file-upload'
+export default {
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_mixin, operation_mixin],
+  data() {
+    return {
+      // 表格属性
+      tableAttributes: {
+        selectColumn: false
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+      formBool: false,
+      formType: 0,
+      formData: {
+        adminCompanyId: '',
+        adminCompanyName: '',
+        code: '',
+        content: '',
+        deptName: '',
+        issueNickName: '',
+        issueTime: '',
+        issueUserId: '',
+        noticeWebsitId: '',
+        num: '',
+        status: 'SEND',
+        title: '',
+        type: '',
+        websitIds: [],
+        websits: [],
+        file: []
+      },
+      formRules: {},
+      formInline: {
+        websitId: '',
+        websitName: ''
+      }
+    }
+  },
+  computed: {
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('add', {
+              click: () => {
+                this.openWindow(() => {
+                  this.formType = 0
+                  this.formBool = true
+                })
+              }
+            })
+          ]
+        ]
+      ]
+    },
+
+    items() {
+      return [
+        {
+          name: 'el-select',
+          md: 12,
+          name: 'el-radio',
+          options: [
+            { label: '管理', value: 'GL' },
+            { label: '技术', value: 'JS' },
+            { label: '其他', value: 'QT' },
+            { label: '政策', value: 'ZC' },
+            { label: '资讯', value: 'ZX' }
+          ],
+          attributes: {
+            placeholder: '请输入'
+          },
+          formItemAttributes: {
+            label: '通知类型',
+            prop: 'type',
+            rules: [...required]
+          }
+        },
+        {
+          name: 'el-input',
+          md: 12,
+          attributes: {
+            placeholder: '请输入'
+          },
+          formItemAttributes: {
+            label: '来源部门',
+            prop: 'deptName',
+            rules: [...required]
+          }
+        },
+        {
+          name: 'el-input',
+          md: 12,
+          attributes: {
+            placeholder: '请输入'
+          },
+          formItemAttributes: {
+            label: '文件编号',
+            prop: 'code',
+            rules: [...required]
+          }
+        },
+        {
+          name: 'el-input',
+          md: 12,
+          attributes: {
+            placeholder: '请输入'
+          },
+          formItemAttributes: {
+            label: '文件标题',
+            prop: 'title',
+            rules: [...required]
+          }
+        },
+        {
+          name: 'slot-component',
+          md: 24,
+          attributes: { disabled: this.disabled },
+          formItemAttributes: { label: '通知内容', prop: 'content', rules: [...required] },
+          render: (h, { props }) => {
+            var { formData } = props
+            return (
+              <v-quill-editor
+                value={formData.content}
+                onInput={val => {
+                  formData.content = val
+                }}
+              ></v-quill-editor>
+            )
+          }
+        },
+        {
+          md: 24,
+          isShow: true,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '附件',
+            prop: 'file',
+            rules: []
+          },
+          render: (h, { props, onInput }) => {
+            var { value } = props
+            return <ImageUpload fileList={this.formData.file} uid="idcardUpUrl_drawg_FUJIAN" limit={100} />
+          }
+        }
+      ]
+    },
+    items2() {
+      return [
+        {
+          name: 'slot-component',
+          md: 24,
+          attributes: {},
+          formItemAttributes: { label: '', 'label-width': '0px', prop: 'websits', rules: [...required] },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <div>
+                <div>
+                  <el-form
+                    size="mini"
+                    inline={true}
+                    value={this.formInline}
+                    onInput={v => {
+                      this.formInline = v
+                    }}
+                    label-width="0px"
+                  >
+                    <el-form-item label="">
+                      <el-input
+                        value={this.formInline.websitId}
+                        onInput={v => {
+                          this.formInline.websitId = v
+                        }}
+                        placeholder="网点编号"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="">
+                      <el-input
+                        value={this.formInline.websitName}
+                        onInput={v => {
+                          this.formInline.websitName = v
+                        }}
+                        placeholder="网点名称"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button
+                        type="primary"
+                        onClick={() => {
+                          EventBus.$emit('handlePaginationCallBack22')
+                        }}
+                      >
+                        查询
+                      </el-button>
+                      <el-button
+                        onClick={() => {
+                          this.formInline.websitId = ''
+                          this.formInline.websitName = ''
+                          this.$nextTick(() => {
+                            EventBus.$emit('handlePaginationCallBack22')
+                          })
+                        }}
+                      >
+                        重置
+                      </el-button>
+                    </el-form-item>
+                  </el-form>
+                </div>
+                <pagingTransfer
+                  handlePaginationCallBackKey="handlePaginationCallBack22"
+                  value={this.formData.websits}
+                  onInput={v => {
+                    this.formData.websits = v
+                  }}
+                  left-columns={[
+                    { id: 'belongCompanyCode', label: '所属公司编号', width: '160' },
+                    { id: 'websitId', label: '网点编号', width: '120' },
+                    { id: 'websitName', label: '网点名称', width: '' }
+                  ]}
+                  right-columns={[
+                    { id: 'belongCompanyCode', label: '所属公司编号', width: '160' },
+                    { id: 'websitId', label: '网点编号', width: '120' },
+                    { id: 'websitName', label: '网点名称', width: '' }
+                  ]}
+                  show-pagination={false}
+                  pagination-call-back={this.paginationCallback}
+                  title-texts={['待选项', '已选项']}
+                  min-height="300px"
+                  table-row-key={row => row.websitId}
+                />
+              </div>
+            )
+          }
+        }
+      ]
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList: noticeWebsitList,
+    // 导出
+    exportList: noticeWebsitListExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 获取勾选框数据
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    handleClose() {
+      this.$refs?.pageRef?.refreshList()
+      this.$data.formData = this.$options.data().formData
+      this.formType = 0
+      this.formBool = false
+    },
+    formConfirm() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          ;(this.formType ? noticeWebsitUpdate : noticeWebsitAdd)({
+            ...this.formData,
+            websitIds: this.formData.websits.map(item => item.websitId),
+            file: this.formData.file.map(item => item.url).join(',')
+          }).then(res => {
+            this.$message({ type: 'success', message: '成功!' })
+            this.$refs.pageRef.refreshList()
+            this.handleClose()
+          })
+        }
+      })
+    },
+    operation() {
+      return this.operationBtn({
+        details: {
+          click: ({ row, index, column }) => {
+            this.openWindow(() => {
+              noticeWebsitDetail({
+                id: row.id
+              }).then(res => {
+                this.formData = { ...res.data }
+              })
+            })
+          }
+        },
+        publish: {
+          prompt: '确定发布吗？',
+          conditions: ({ row, index, column }) => {
+            return row.status !== 'SEND'
+          },
+          click: ({ row, index, column }) => {
+            noticeWebsitOfOrSend({
+              id: row.id,
+              status: 'SEND'
+            }).then(res => {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+              this.$refs.pageRef.refreshList()
+            })
+          }
+        },
+        close: {
+          prompt: '确定关闭吗？',
+          conditions: ({ row, index, column }) => {
+            return row.status !== 'OFF'
+          },
+          click: ({ row, index, column }) => {
+            noticeWebsitOfOrSend({
+              id: row.id,
+              status: 'OFF'
+            }).then(res => {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+              this.$refs.pageRef.refreshList()
+            })
+          }
+        }
+      })
+    },
+    openWindow(cb) {
+      this.$nextTick(() => {
+        cb?.()
+      })
+    },
+    paginationCallback({ pageIndex, pageSize }) {
+      return new Promise(resolve => {
+        getWebsit({ ...this.formInline }).then(res => {
+          resolve({
+            total: res.data.filter(item => item.type == 'C').length,
+            data: res.data
+              .filter(item => item.type == 'C')
+              .map(item => {
+                return {
+                  ...item,
+                  websitName: item.name
+                }
+              })
+          })
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.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/streetConfiguration/index.vue

@@ -73,13 +73,15 @@ import {
   dispatchSmallList,
   dispatchCategoryList,
   dispatchSourceList,
-  dispatchSaveDispatch
+  dispatchSaveDispatch,
+  dispatchSalesList
 } 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'
+import { getDataDictionary } from '@/api/dataDictionary.js'
 export default {
   components: {
     TemplatePage
@@ -104,9 +106,8 @@ export default {
       cityList: [],
       areaList: [],
       streetList: [],
-      orderSourceIdsList: [],
+      saleIdsList: [],
       orderSmallIdsList: [],
-      orderChannelIdsList: [],
       categoryIdsList: [],
       formData: {
         provinceCode: '',
@@ -118,11 +119,11 @@ export default {
         streetCode: '',
         streetName: '',
         categoryIds: [],
-        orderChannelIds: [],
         orderSmallIds: [],
-        orderSourceIds: [],
+        saleIds: [],
         websitId: '',
-        websitName: ''
+        websitName: '',
+        SALES_TYPE_LIST: []
       },
       formDialog: false,
       websit: null,
@@ -143,9 +144,26 @@ export default {
                 return [
                   this.optionsEvensAuth('add', {
                     click: () => {
-                      this.formData.websitId = this.websit.websitId
-                      this.formData.websitName = this.websit.name
-                      this.formDialog = true
+                      getDataDictionary({
+                        pageNum: 1,
+                        pageSize: -1,
+                        params: [
+                          { param: 'a.status', compare: '=', value: 'ON' },
+                          { param: 'a.dict_type', compare: '=', value: 'SALES_TYPE' }
+                        ]
+                      }).then(res => {
+                        this.SALES_TYPE_LIST = res.data.records
+                          .filter(item => {
+                            return Number(item.dictCode) >= 100
+                          })
+                          .map(item => ({
+                            value: Number(item.dictCode),
+                            label: item.dictValue
+                          }))
+                        this.formData.websitId = this.websit.websitId
+                        this.formData.websitName = this.websit.name
+                        this.formDialog = true
+                      })
                     }
                   })
                 ]
@@ -336,33 +354,6 @@ export default {
         },
         {
           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: {
@@ -417,24 +408,24 @@ export default {
         },
         {
           name: 'zj-paging-pull-down',
-          options: this.orderSourceIdsList,
+          options: this.saleIdsList,
           md: 24,
           attributes: {
             placeholder: '请选择',
             clearable: true,
             filterable: true,
             multiple: true,
-            loading: !this.orderSourceIdsList.length
+            loading: !this.saleIdsList.length
           },
           formItemAttributes: {
-            label: '工单来源',
-            prop: 'orderSourceIds',
+            label: '销售类型',
+            prop: 'saleIds',
             rules: [...required]
           },
           events: {
             focus: val => {
-              dispatchSourceList(this.getPam('orderSourceIds')).then(res => {
-                this.orderSourceIdsList = res.data.map(item => ({
+              dispatchSalesList(this.getPam('saleIds')).then(res => {
+                this.saleIdsList = res.data.map(item => ({
                   value: item.keyId,
                   label: item.valueName
                 }))
@@ -561,7 +552,7 @@ export default {
         'dictCode',
         'categoryId',
         'orderSmallId',
-        'orderSourceId'
+        'saleIds'
       ].filter(k => k !== key)
       var obj = {}
       keys.map(k => {
@@ -583,9 +574,8 @@ export default {
         streetCode: '',
         streetName: '',
         categoryIds: [],
-        orderChannelIds: [],
         orderSmallIds: [],
-        orderSourceIds: [],
+        saleIds: [],
         websitId: '',
         websitName: ''
       }