Merge branch 'debelop' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI into debelop

CallCenterWeb.UI/RMYY/src/api/commonAPI.js

@@ -87,3 +87,21 @@ export function GetTypeState(params) {
     params
   })
 }
+// 保存自定义列
+export function AddFiled(data) {
+  return request({
+    url: '/CustomFiled/AddFiled',
+    method: 'post',
+    data
+  })
+}
+// 获取自定义列
+export function GetFiledState(TableId) {
+  return request({
+    url: '/CustomFiled/GetTab',
+    method: 'get',
+    params:{
+      TableId
+    }
+  })
+}

CallCenterWeb.UI/RMYY/src/components/context/addDefinedList/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :model="ruleForm" label-width="100px">
+      <el-form-item label="自定义字段">
+        <el-checkbox
+          :indeterminate="isIndeterminate"
+          v-model="checkAll"
+          @change="handleCheckAllChange"
+        >
+          全选
+        </el-checkbox>
+        <div style="margin: 15px 0" />
+        <el-checkbox-group
+          v-model="checkedCities"
+          @change="handleCheckedCitiesChange"
+        >
+          <el-checkbox v-for="city in cities" :label="city.key" :key="city.key">
+            {{ city.value }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import { AddFiled, GetFiledState } from '@/api/commonAPI'
+import fieldDATA from '@/utils/fieldsData.js'
+export default {
+  props: {
+    definedId: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      ruleForm: {
+        id: '', // id
+        TableId: '', // 列表ID
+        Fileds: '' // 字段值
+      },
+      cityOptionsValue: [],
+      checkAll: false,
+      checkedCities: [],
+      cities: [],
+      isIndeterminate: false
+    }
+  },
+  created() {
+    fieldDATA.orderManage_orderList.forEach((element) => {
+      this.cityOptionsValue.push(element.key)
+    })
+    this.cities = fieldDATA.orderManage_orderList
+    this.ruleForm.TableId = this.definedId.split('/').join('_')
+    this.getFiledTabDetail(this.ruleForm.TableId)
+  },
+  methods: {
+    handleCheckAllChange(val) {
+      this.checkedCities = val ? this.cityOptionsValue : []
+      this.ruleForm.Fileds = this.checkedCities.join(',')
+      this.isIndeterminate = false
+    },
+    handleCheckedCitiesChange(value) {
+      this.ruleForm.Fileds = value.join(',')
+      const checkedCount = value.length
+      this.checkAll = checkedCount === this.cities.length
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.cities.length
+    },
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          // 添加
+          AddFiled(this.ruleForm)
+            .then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getFiledTabDetail(this.ruleForm.TableId) // 重新加载父级数据
+                this.$message.success('保存成功!')
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+    getFiledTabDetail(TableId) {
+      GetFiledState(TableId).then((res) => {
+        this.ruleForm.TableId = res.F_TableId
+        if (res.F_Fileds) {
+          this.ruleForm.Fileds = res.F_Fileds
+          this.checkedCities = res.F_Fileds
+          if (this.checkedCities) {
+            this.handleCheckedCitiesChange(this.checkedCities)
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.form_select {
+  width: 100%;
+}
+</style>

CallCenterWeb.UI/RMYY/src/utils/fieldsData.js

@@ -0,0 +1,30 @@
+export default {
+  orderManage_orderList: [
+    {
+      key: 'F_WoCode',
+      value: '工单编号'
+    },
+    {
+      key: 'F_ProposerName',
+      value: '姓名'
+    },
+    {
+      key: 'F_SonType',
+      value: '工单类别'
+    },
+    {
+      key: 'F_Content',
+      value: '工单内容'
+    },
+    {
+      key: 'StateName',
+      value: '工单状态'
+    },
+    {
+      key: 'F_CreateTime',
+      value: '创建时间'
+    }
+  ]
+
+}
+

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -11,10 +11,27 @@
         range-separator="至"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        size="medium"/>
-      <el-input v-model="searchData.keyword" placeholder="请输入关键字" class="filter-item" size="medium"/>
-      <el-select v-model="searchData.type" clearable placeholder="请选择业务类别" size="medium" @change="changeOrder">
-        <el-option v-for="item in orderData" :key="item.id" :label="item.text" :value="item.id" />
+        size="medium"
+      />
+      <el-input
+        v-model="searchData.keyword"
+        placeholder="请输入关键字"
+        class="filter-item"
+        size="medium"
+      />
+      <el-select
+        v-model="searchData.type"
+        clearable
+        placeholder="请选择业务类别"
+        size="medium"
+        @change="changeOrder"
+      >
+        <el-option
+          v-for="item in orderData"
+          :key="item.id"
+          :label="item.text"
+          :value="item.id"
+        />
       </el-select>
       <el-cascader
         ref="cascader"
@@ -25,25 +42,99 @@
         placeholder="请选择工单类别"
         filterable
         clearable
-        @change="handleChange"/>
-      <el-button type="primary" class="filter-btn" icon="el-icon-search" @click="btn_search">搜索</el-button>
+        @change="handleChange"
+      />
+      <el-button
+        type="primary"
+        class="filter-btn"
+        icon="el-icon-search"
+        @click="btn_search"
+      >
+        搜索
+      </el-button>
+      <el-button
+        type="primary"
+        class="filter-btn"
+        icon="el-icon-search"
+        @click="btn_add_list"
+      >
+        设置列
+      </el-button>
     </div>
-    <el-table v-loading="loading" ref="multipleTable" :data="dataLists" border stripe row-key="F_Id">
-      <el-table-column type="index" label="编号" align="center" fixed width="60" />
-      <el-table-column prop="F_WoCode" label="工单编号" align="center" min-width="110">
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="dataLists"
+      border
+      stripe
+      row-key="F_Id"
+    >
+      <el-table-column
+        type="index"
+        label="编号"
+        align="center"
+        fixed
+        width="60"
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_WoCode"
+        prop="F_WoCode"
+        label="工单编号"
+        align="center"
+        min-width="110"
+      >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="hadndleOrderCode(scope.row.F_WoCode)">{{ scope.row.F_WoCode }}
+          <el-button
+            type="text"
+            size="small"
+            @click="hadndleOrderCode(scope.row.F_WoCode)"
+          >
+            {{ scope.row.F_WoCode }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="F_ProposerName" label="姓名" align="center" min-width />
-      <el-table-column prop="F_SonType" :formatter="formtOrder" label="工单类别" align="center" />
-      <el-table-column prop="F_Content" label="工单内容" align="center" />
-      <el-table-column prop="StateName" label="工单状态" align="center" />
-      <el-table-column prop="F_CreateTime" label="创建时间" align="center" />
+      <el-table-column
+        v-if="fieldListFlag.F_ProposerName"
+        prop="F_ProposerName"
+        label="姓名"
+        align="center"
+        min-width
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_SonType"
+        :formatter="formtOrder"
+        prop="F_SonType"
+        label="工单类别"
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_Content"
+        prop="F_Content"
+        label="工单内容"
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.StateName"
+        prop="StateName"
+        label="工单状态"
+        align="center"
+      />
+      <el-table-column
+        v-if="fieldListFlag.F_CreateTime"
+        prop="F_CreateTime"
+        label="创建时间"
+        align="center"
+      />
       <el-table-column label="操作" align="center" class-name="oparate_btn">
         <template slot-scope="scope">
-          <el-button v-for="item in scope.row.Buttons" :key="item.key" type="text" @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)">{{ item.value }}</el-button>
+          <el-button
+            v-for="item in scope.row.Buttons"
+            :key="item.key"
+            type="text"
+            @click="btnClickEvents(item, scope.row.F_WoCode, scope.row)"
+          >
+            {{ item.value }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -53,33 +144,26 @@
       :pageindex.sync="pageParams.pageindex"
       :pagesize.sync="pageParams.pagesize"
       class="pagination"
-      @pagination="getList" />
-    <order-button-operation ref="butOption" @refList="refList"/>
+      @pagination="getList"
+    />
+    <order-button-operation ref="butOption" @refList="refList" />
   </div>
 </template>
 
 <script>
 // import { getDictionaryValueList } from '@/api/commonAPI'
 import {
-  getorderList,
   deleteOrder,
-  SureOrder,
-  AssignOrder,
   CompleteOrder,
   comOrderList,
   getOrderStateData
 } from '@/api/orderManagement/orderList'
-import {
-  getOrderTypeList
-} from '@/api/commonAPI'
-import {
-  getOrderTypeDrop
-} from '@/api/systemSetup/roleSetting/menuSetup'
-  // import { pickerOptions } from '@/utils'
-// import AddOrEditInfOrder from '@/views/orderManage/components/addOrEditInfOrder'
+import { getOrderTypeDrop } from '@/api/systemSetup/roleSetting/menuSetup'
+import { GetFiledState } from '@/api/commonAPI'
 import addOrEditFaultRepair from '../../faultRepair/clinicalReporting/components/addRepairbase.vue'
 import detail from '../components/orderDetail.vue'
 import addAudit from './addAudit'
+import addDefinedList from '@/components/context/addDefinedList'
 import orderDeal from './orderDeal'
 import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
 import OrderButtonOperation from '@/components/button/orderList'
@@ -95,6 +179,7 @@ export default {
       isDisable: false, // 防止多次点击
       loading: false,
       deleteId: [],
+      fieldListFlag: {},
       buttonName: '',
       searchData: {
         keyword: '', // 关键字
@@ -121,14 +206,15 @@ export default {
       },
       orderData: [],
       subclassData: [],
-      orderstate: [] // 工单状态数据
+      orderstate: [], // 工单状态数据
+      DefinedId: ''
     }
   },
   created() {
     this.getList()
     this.getTreeList()
-    // this.getOrderTypeData(2, 1000)
     this.getOrderStat()
+    this.getFiledTabDetail(this.$route.path.split('/').join('_'))
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
         this.getList()
@@ -150,9 +236,8 @@ export default {
     },
     btnClickEvents(button, wocode, row) {
       this.buttonName = button.key
-      console.log(this.buttonName, 'name')
       this.$refs.butOption.butOptionMethod(this.buttonName, wocode)
-      if(this.buttonName=='bianji'){
+      if (this.buttonName === 'bianji') {
         this.btn_edit(wocode)
       }
     },
@@ -178,10 +263,36 @@ export default {
         resolve()
       })
     },
+    getFiledTabDetail(TableId) {
+      GetFiledState(TableId).then((res) => {
+        const filedsData = res.F_Fileds
+        const filedsObj = {}
+        if (filedsData) {
+          filedsData.forEach((element) => {
+            filedsObj[element] = true
+          })
+        }
+        this.fieldListFlag = filedsObj
+        this.$refs['multipleTable'].doLayout()
+      })
+    },
     btn_search() {
       this.pageParams.pageindex = 1
       this.getList()
     },
+    btn_add_list() {
+      this.$layer.iframe({
+        content: {
+          content: addDefinedList, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: {
+            definedId: this.$route.path
+          } // props
+        },
+        area: ['70%', '30%'],
+        title: '自定义字段'
+      })
+    },
     // 编辑
     btn_edit(rid) {
       this.$layer.iframe({
@@ -277,14 +388,6 @@ export default {
         title: '订单详情'
       })
     },
-    // 工单类型
-    // getOrderTypeData(id, pid) {
-    //   getOrderTypeList(id, pid).then((response) => {
-    //     if (response.rows) {
-    //       this.secondOrderData = response.rows
-    //     }
-    //   })
-    // },
     // 工单状态
     getOrderStat() {
       return new Promise((resolve) => {
@@ -309,12 +412,9 @@ export default {
       })
     },
     handleChange(data) {
-      console.log(data)
       this.searchData.menutype = data[data.length - 1]
-      console.log(this.searchData.menutype)
     },
     changeOrder(data) {
-      console.log(data)
       if (!data) {
         return
       }
@@ -337,5 +437,4 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
 </style>