Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/workManagement/task/configuration/mainList.json

@@ -83,7 +83,8 @@
     },
     {
       "label": "承做人",
-      "prop": "userid",
+      "prop": "userName",
+      "search": true,
       "overHidden": true,
       "width": 150
     },
@@ -98,12 +99,20 @@
     {
       "label": "服务项目",
       "prop": "pname",
+      "search": true,
       "overHidden": true,
       "width": 120
     },
     {
       "label": "任务部门",
-      "prop": "deptName",
+      "prop": "deptid",
+      "type": "tree",
+      "dicUrl": "/api/blade-system/dept/tree?tenantId=096359",
+      "props": {
+        "label": "title",
+        "value": "value"
+      },
+      "search": true,
       "overHidden": true,
       "width": 120
     },
@@ -133,7 +142,7 @@
       "label": "提成",
       "prop": "commission",
       "overHidden": true,
-      "cell":true,
+      "cell": true,
       "width": 120
     },
     {
@@ -151,7 +160,6 @@
       "valueFormat": "yyyy-MM-dd",
       "type": "date",
       "unlinkPanels": true,
-      "search": true,
       "overHidden": true,
       "width": 150,
       "cell": true
@@ -163,12 +171,23 @@
       "valueFormat": "yyyy-MM-dd",
       "type": "date",
       "unlinkPanels": true,
-      "search": true,
       "overHidden": true,
       "width": 150,
       "cell": true
     },
     {
+      "label": "业务日期",
+      "prop": "createdTime",
+      "type": "date",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "yyyy-MM-dd",
+      "unlinkPanels": true,
+      "searchRange": true,
+      "search": true,
+      "hide": true,
+      "showColumn": false
+    },
+    {
       "label": "制单人",
       "prop": "createUserName",
       "disabled": true,
@@ -195,4 +214,4 @@
       "overHidden": true
     }
   ]
-}
+}

src/views/workManagement/task/index.vue

@@ -14,11 +14,20 @@
         <el-button icon="el-icon-printer" size="small" type="primary" :loading="exportLoading" @click.stop="downFile">导出
         </el-button>
       </template>
-      <template slot="userid" slot-scope="{row,index}">
-        <user-select style="width:90% !important;" v-if="row.$cellEdit" v-model="row.userName"
-          @value="(values) => value(values, row)" :configuration="UConfiguration">
-        </user-select>
-        <span v-else>{{ row.userName }}</span>
+      <template slot="userNameSearch">
+        <el-select v-model="search.userName" remote filterable clearable :remote-method="remoteMethod">
+          <el-option v-for="item in options" :key="item.value" :label="item.realName" :value="item.realName">
+          </el-option>
+        </el-select>
+      </template>
+      <template slot="deptid" slot-scope="{row,index}">
+        <span>{{ row.deptName }}</span>
+      </template>
+      <template slot="pnameSearch">
+        <el-select v-model="search.pname" filterable clearable size="small">
+          <el-option v-for="(item, index) in goodsDescList" :key="index" :label="item.cname" :value="item.cname">
+          </el-option>
+        </el-select>
       </template>
       <template slot-scope="{row,index}" slot="menu">
         <el-button type="text" icon="el-icon-view" size="small" @click.stop="copyTo">发送
@@ -57,15 +66,18 @@ import { getFlowList } from "@/api/workManagement/mainProject";
 import { updateItemStatus } from "@/api/workManagement/mainProject";
 import { getUserList } from "@/api/workManagement/mainProject";
 import { saveMessage } from "@/api/logs";
+import { getGoodsDescList } from "@/api/standAlone/saleLeads";
 export default {
   name: "customerInformation",
   data() {
     return {
+      goodsDescList: [],
       loading: false,
       exportLoading: false,
       copyToDialog: false,
       form: {},
       search: {},
+      options: [],
       configuration: {
         multipleChoices: false,
         multiple: false,
@@ -107,7 +119,7 @@ export default {
           },
           {
             label: '抄送日期',
-            prop: 'createTime',
+            prop: 'createdTime',
             type: "datetime",
             span: 12,
             disabled: true,
@@ -153,9 +165,13 @@ export default {
       res.data.data.map((item, index) => {
         if (index <= 20) {
           this.userOption.push(item)
+          this.options.push(item)
         }
       })
     })
+    getGoodsDescList().then(res => {
+      this.goodsDescList = res.data.data
+    })
     // option.height = window.innerHeight - 350 ;
   },
   methods: {
@@ -178,7 +194,7 @@ export default {
       this.copyToDialog = true;
       let date = new Date();
       let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-      this.$set(this.formMeg, "createTime", strDate)
+      this.$set(this.formMeg, "createdTime", strDate)
     },
     //用户远程模糊
     remoteMethod(query) {
@@ -277,12 +293,10 @@ export default {
       //   this.$delete(params, 'beginTime')
       // }
       let data = this.deepClone(Object.assign({}, params, this.search));
-      if (data.careteTime && data.careteTime.length > 0) {
-        data = {
-          ...data,
-          beginCreateTime: data.careteTime[0],
-          endCreateTime: data.careteTime[1]
-        };
+      if (data.createdTime) {
+        data.beginTime = data.createdTime[0]
+        data.endTime = data.createdTime[1]
+        delete data.createdTime
       }
       if (!data.status) {
         data.status = "1,4,5";