字典

src/api/cus.js

@@ -1,4 +1,5 @@
 import request from '@/utils/httpRequest'
+import { getDictList } from '@/api/dict'
 
 export function getLevel () {
   return request({

src/api/dict.js

@@ -0,0 +1,13 @@
+import request from '@/utils/httpRequest'
+
+/**
+ * 根据字典类型获取字典List
+ * @param dictType
+ */
+export function getDictList (params) {
+  return request({
+    url: request.adornUrl('/user-service/dict/queryByType'),
+    method: 'get',
+    params
+  })
+}

src/views/modules/cus/communicate-add-or-update.vue

@@ -37,9 +37,9 @@
               placeholder="请选择">
               <el-option
                 v-for="item in options"
-                :key="item.value"
-                :label="item.code"
-                :value="item.value">
+                :key="item.code"
+                :label="item.value"
+                :value="item.code">
               </el-option>
             </el-select>
           </el-form-item>
@@ -53,18 +53,20 @@
       <el-row class="my-row">
         <div class="title"><span style="color: red">*</span> 沟通扫描件</div>
         <el-upload
-          v-show="!display"
           class="upload-demo"
           ref="upload"
           :multiple="true"
-          action=""
+          action="#"
           :on-preview="handlePreview"
           :on-remove="handleRemove"
           :on-change="handleChange"
           :file-list="fileList"
+          :limit="5"
+          :on-exceed="handleExceed"
           :auto-upload="false">
           <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，最多5张图片，且每张图片不超过10M</div>
         </el-upload>
       </el-row>
       <div class="title"><span style="color: red">*</span> 订单产品明细</div>
@@ -150,6 +152,7 @@
   import templateChose from '../warehouse/template-chose'
   import { getType, getCustomer, getCoDetail } from '@/api/cus'
   import { uploadUrl, downloadUrl, uploadFiles } from '@/api/file'
+  import { getDictList } from '@/api/dict'
   export default {
     name: 'communicate-add-or-update',
     components: {templateChose},
@@ -197,11 +200,17 @@
         this.visible = true
         this.id = id || 0
         this.display = display
-        await getType().then(({data}) => {
-          if (data && data.code === '200') {
-            this.options = data.data
+        // 获取沟通类别
+        await getDictList({type: 'communication_type'}).then(({data}) => {
+          if (data) {
+            this.options = data
           }
         })
+        // await getType().then(({data}) => {
+        //   if (data && data.code === '200') {
+        //     this.options = data.data
+        //   }
+        // })
         await getCustomer().then(({data}) => {
           if (data && data.code === '200') {
             this.optionsCus = data.data
@@ -220,7 +229,7 @@
                 id: item.url
               })
             })
-            console.log('this.fileList = ' + JSON.stringify(this.fileList))
+            // console.log('this.fileList = ' + JSON.stringify(this.fileList))
           }
         })
       },
@@ -259,6 +268,9 @@
       handleChange (file, fileList) {
         this.fileList = fileList
       },
+      handleExceed (files, fileList) {
+        this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+      },
       // 表单提交
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {

src/views/modules/cus/communicate.vue

@@ -46,6 +46,7 @@
       </el-table-column>
       <el-table-column
         prop="coType"
+        :formatter="typeFormat"
         header-align="center"
         align="center"
         label="沟通类别">
@@ -97,6 +98,7 @@
 
 <script>
   import AddOrUpdate from './communicate-add-or-update'
+  import { getDictList } from '@/api/dict'
   export default {
     name: 'communicate',
     components: {
@@ -118,9 +120,18 @@
       }
     },
     created () {
+      this.getCoType()
       this.getDataList()
     },
     methods: {
+      // 获取沟通类别
+      getCoType () {
+        getDictList({type: 'communication_type'}).then(({data}) => {
+          if (data) {
+            this.options = data
+          }
+        })
+      },
       // 获取数据列表
       getDataList () {
         this.addOrUpdateVisible = false
@@ -195,6 +206,16 @@
             }
           })
         }).catch(() => {})
+      },
+      // 转换属性“沟通类别”
+      typeFormat (row) {
+        console.log('row.coType = ' + row.coType)
+        console.log('options = ' + JSON.stringify(this.options))
+        for (let i = 0; i < this.options.length; i++) {
+          if (this.options[i].code === row.coType) {
+            return this.options[i].value
+          }
+        }
       }
     }
   }

src/views/modules/cus/customer-add-or-update.vue

@@ -28,9 +28,9 @@
           placeholder="请选择">
           <el-option
             v-for="item in options"
-            :key="item.value"
-            :label="item.code"
-            :value="item.value">
+            :key="item.code"
+            :label="item.value"
+            :value="item.code">
           </el-option>
         </el-select>
       </el-form-item>

src/views/modules/cus/customer.vue

@@ -11,9 +11,9 @@
           placeholder="请选择">
           <el-option
             v-for="item in options"
-            :key="item.value"
-            :label="item.code"
-            :value="item.value">
+            :key="item.code"
+            :label="item.value"
+            :value="item.code">
           </el-option>
         </el-select>
       </el-form-item>
@@ -188,8 +188,8 @@
       // 转换属性“级别”
       levelFormat (row) {
         for (let i = 0; i < this.options.length; i++) {
-          if (this.options[i].value === row.level) {
-            return this.options[i].code
+          if (this.options[i].code === row.level) {
+            return this.options[i].value
           }
         }
       }

src/views/modules/notice/list.vue

@@ -1,116 +0,0 @@
-<template>
-  <div class="stock">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item label="标题">
-        <el-input v-model="dataForm.title" placeholder="请输入标题" clearable/>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dataForm.date"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          end-placeholder="结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle(0, false)">发布公告</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%;">
-      <el-table-column
-        label="序号"
-        type="index"
-        width="50"
-        align="center">
-      </el-table-column>
-      <el-table-column
-        prop="coCode"
-        header-align="center"
-        align="center"
-        label="公告主题名称">
-      </el-table-column>
-      <el-table-column
-        prop="customerName"
-        header-align="center"
-        align="center"
-        label="客户名称">
-      </el-table-column>
-      <el-table-column
-        prop="contact"
-        header-align="center"
-        align="center"
-        label="联系人">
-      </el-table-column>
-      <el-table-column
-        prop="bizManagerName"
-        header-align="center"
-        align="center"
-        label="对接业务员">
-      </el-table-column>
-      <el-table-column
-        prop="coType"
-        header-align="center"
-        align="center"
-        label="沟通类别">
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        prop="notes"
-        header-align="center"
-        align="center"
-        label="备注">
-      </el-table-column>
-      <el-table-column
-        prop="-"
-        header-align="center"
-        align="center"
-        label="附件">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.coId, true)">查看</el-button>
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.coId, false)">编辑</el-button>
-          <el-button style="color: red" type="text" size="small" @click="deleteHandle(scope.row.coId)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'list.vue'
-  }
-</script>
-
-<style scoped>
-
-</style>

src/views/modules/notice/notice-add-or-update.vue

@@ -0,0 +1,185 @@
+<template>
+  <el-dialog
+    :title="!id ? '发布': display ? '详情' : '修改'"
+    width="70%"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
+      <el-row class="my-row">
+        <el-col :span="12">
+          <el-form-item label="公告主题名称">
+            <el-input v-model="dataForm.title" :disabled="display" placeholder="请输入公告主题名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" style="padding-left: 20px">
+          <el-form-item label="级别" prop="level">
+            <el-select
+              v-model="dataForm.level"
+              :disabled="display"
+              remote
+              placeholder="请选择">
+              <el-option
+                v-for="item in optionLevel"
+                :key="item.code"
+                :label="item.value"
+                :value="item.code">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-col :span="12">
+          <el-form-item label="客户名称" prop="name">
+            <el-input v-model="dataForm.name" disabled placeholder="客户名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" style="padding-left: 20px">
+          <el-form-item label="联系人" prop="cellName">
+            <el-input v-model="dataForm.cellName" disabled placeholder="联系人"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-form-item label="备注说明">
+            <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
+        </el-form-item>
+      </el-row>
+      <el-row class="my-row">
+        <div class="title">沟通信息表附件</div>
+      </el-row>
+      <el-row class="my-row">
+        <div class="title"><span style="color: red">*</span> 合同评审表</div>
+        <el-upload
+          v-show="!display"
+          class="upload-demo"
+          ref="upload"
+          action="https://jsonplaceholder.typicode.com/posts/"
+          :on-preview="handlePreview"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :auto-upload="false">
+          <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">开始上传</el-button>
+        </el-upload>
+      </el-row>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button v-if="!display" type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  import { getcoCode, getReviewType, getreDetail } from '@/api/cus'
+  export default {
+    name: 'notice-add-or-update',
+    data () {
+      return {
+        visible: false,
+        dictType: 'material_type',
+        options: [],
+        options1: [],
+        dataList: [],
+        fileList: [],
+        id: 0,
+        dataForm: {
+          coCode: '',
+          name: '',
+          cellName: '',
+          reType: '',
+          notes: '',
+          attachList: []
+        },
+        dataRule: {
+          coCode: [{ required: true, message: '沟通编码不能为空', trigger: 'change' }],
+          reType: [{ required: true, message: '评审类别不能为空', trigger: 'change' }],
+          name: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
+          cellName: [{ required: true, message: '联系人不能为空', trigger: 'blur' }]
+        },
+        display: false
+      }
+    },
+    watch: {
+      'dataForm.coCode' (value) {
+        this.options1.forEach(v => {
+          if (v.customerId === value) {
+            this.dataForm.name = v.customerName
+            this.dataForm.cellName = v.contact
+          }
+        })
+      }
+    },
+    methods: {
+      async init (id, disabled) {
+        this.visible = true
+        this.id = id || 0
+        await getReviewType().then(({data}) => {
+          if (data && data.code === '200') {
+            this.options = data.data
+          }
+        })
+        await getcoCode().then(({data}) => {
+          if (data && data.code === '200') {
+            this.options1 = data.data
+          }
+        })
+        if (!id) return
+        await getreDetail().then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataForm = data.data
+          }
+        })
+      },
+      submitUpload () {
+        this.$refs.upload.submit()
+      },
+      handleRemove (file, fileList) {
+        console.log(file, fileList)
+      },
+      handlePreview (file) {
+        console.log(file)
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/biz-service/flow/cusContractReview/submit`),
+              method: 'post',
+              data: this.$http.adornData(this.dataForm)
+            }).then(({data}) => {
+              if (data && data.code === '200') {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      },
+      validateField (type) {
+        this.$refs.dataForm.validateField(type)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+.my-line{
+  border-bottom: 1px solid #c0c4cc;
+  margin-bottom: 10px;
+}
+.title{
+  padding: 10px 0 ;
+}
+</style>

src/views/modules/notice/notice.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="stock">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item label="标题">
+        <el-input v-model="dataForm.title" placeholder="请输入标题" clearable/>
+      </el-form-item>
+      <el-form-item label="发布时间">
+        <el-date-picker
+          v-model="dataForm.date"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle(0, false)">发布公告</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center">
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        header-align="center"
+        align="center"
+        label="公告主题名称">
+      </el-table-column>
+      <el-table-column
+        prop="levelDesc"
+        header-align="center"
+        align="center"
+        label="级别">
+      </el-table-column>
+      <el-table-column
+        prop="content"
+        header-align="center"
+        align="center"
+        width="180"
+        :show-overflow-tooltip="true"
+        label="公告内容">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="附件">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="接收对象">
+      </el-table-column>
+      <el-table-column
+        prop="-"
+        header-align="center"
+        align="center"
+        label="已读">
+      </el-table-column>
+      <el-table-column
+        prop="publisherName"
+        header-align="center"
+        align="center"
+        label="发布人">
+      </el-table-column>
+      <el-table-column
+        prop="publishTime"
+        header-align="center"
+        align="center"
+        min-width="100"
+        label="发布时间">
+      </el-table-column>
+      <el-table-column
+        prop="notes"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+      <el-table-column
+        prop="stateDesc"
+        header-align="center"
+        align="center"
+        label="状态">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.noticeId, true)">查看</el-button>
+          <el-button style="color: red" type="text" size="small" @click="cancel(scope.row.noticeId, false)">撤回</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './notice-add-or-update'
+  export default {
+    name: 'notice.vue',
+    components: {
+      AddOrUpdate
+    },
+    data () {
+      return {
+        addOrUpdateVisible: false,
+        dataForm: {
+          cusName: ''
+        },
+        options: [],
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: []
+      }
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.addOrUpdateVisible = false
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/biz-service/notice/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'title': this.dataForm.title ? this.dataForm.title : null,
+            'dateStart': this.dataForm.date ? this.dataForm.date[0] : null,
+            'dateEnd': this.dataForm.date ? this.dataForm.date[1] : null
+          })
+        }).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id, display) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(id, display)
+        })
+      },
+      // 删除
+      deleteHandle (id) {
+        if (!id) return
+        let ids = []
+        ids.push(id)
+        this.$confirm(`确定删除?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl(`/biz-service/notice/delete`),
+            method: 'DELETE',
+            data: ids
+          }).then(({data}) => {
+            if (data && data.code === '200') {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/sys/dict-add-or-update.vue

@@ -4,30 +4,44 @@
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="字典名称" prop="name">
-        <el-input v-model="dataForm.name" placeholder="字典名称"></el-input>
-      </el-form-item>
-      <el-form-item label="字典码" prop="code">
-        <el-input v-model="dataForm.code" placeholder="字典码"></el-input>
-      </el-form-item>
-      <el-form-item label="字典类型" prop="type" >
-        <el-input v-model="dataForm.type" placeholder="字典类型"></el-input>
-      </el-form-item>
-      <el-form-item label="字典值" prop="value">
-        <el-input v-model="dataForm.value" placeholder="字典值"></el-input>
-      </el-form-item>
-      <el-form-item label="排序" prop="orderNum">
-        <el-input-number v-model="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input-number>
-      </el-form-item>
-      <el-form-item label="删除标记" size="mini" prop="delFlag">
-        <el-radio-group v-model="dataForm.delFlag">
-          <el-radio :label="0">正常</el-radio>
-          <el-radio :label="-1">已删除</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item>
+      <el-row class="my-row">
+        <el-col :span="12">
+          <el-form-item label="字典名称" prop="name">
+            <el-input v-model="dataForm.name" placeholder="字典名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="字典类型" prop="type" >
+            <el-input v-model="dataForm.type" placeholder="字典类型"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-col :span="12">
+          <el-form-item label="字典码" prop="code">
+            <el-input v-model="dataForm.code" placeholder="字典码"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="字典值" prop="value">
+            <el-input v-model="dataForm.value" placeholder="字典值"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-col :span="12">
+          <el-form-item label="排序" prop="orderNum">
+            <el-input-number v-model="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input-number>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+        </el-col>
+      </el-row>
+      <el-row class="my-row">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        </el-form-item>
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>

src/views/modules/sys/dict.vue

@@ -29,16 +29,16 @@
         label="字典名称">
       </el-table-column>
       <el-table-column
-        prop="code"
+        prop="type"
         header-align="center"
         align="center"
-        label="字典码">
+        label="字典类型">
       </el-table-column>
       <el-table-column
-        prop="type"
+        prop="code"
         header-align="center"
         align="center"
-        label="字典类型">
+        label="字典码">
       </el-table-column>
       <el-table-column
         prop="value"