Merge pull request 'master' (#224) from master into test

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/224

src/views/task-management/all-work-order/index.vue

@@ -64,7 +64,18 @@ const searchConfig = reactive([
       filterable: true,
     },
     component: shallowRef(fvSelect),
-  }, {
+  },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
+    props: {
+      placeholder: '请输入联系人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
+  {
     label: '处理人',
     prop: 'operationUser',
     props: {
@@ -152,13 +163,13 @@ const tableConfig = reactive({
       prop: 'alarmUnit',
       label: '拨打单位',
       align: 'center',
-      width: 200
+      width: 120
     },
     {
       prop: 'alarmObject',
       label: '拨打对象',
       align: 'center',
-      width: 200
+      width: 100
     },
     {
       prop: 'orderState',
@@ -187,10 +198,24 @@ const tableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',
       align: 'center',
+      width: 100,
       currentRender: ({row, index}) => {
         if (row.operationUser) {
           return row.operationUser

src/views/task-management/historical-work-order/index.vue

@@ -56,6 +56,16 @@ const searchConfig = reactive([
   //   },
   //   component: 'el-input',
   // },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
+    props: {
+      placeholder: '请输入联系人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
   {
     label: '处理人',
     prop: 'operationUser',
@@ -144,13 +154,13 @@ const tableConfig = reactive({
       prop: 'alarmUnit',
       label: '拨打单位',
       align: 'center',
-      width: 200
+      width: 120
     },
     {
       prop: 'alarmObject',
       label: '拨打对象',
       align: 'center',
-      width: 200
+      width: 100
     },
     {
       prop: 'orderState',
@@ -179,6 +189,20 @@ const tableConfig = reactive({
         }
       }
     },
+
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',

src/views/task-management/pending-work-order/index.vue

@@ -56,6 +56,16 @@ const searchConfig = reactive([
   //   },
   //   component: 'el-input',
   // },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
+    props: {
+      placeholder: '请输入联系人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
   {
     label: '处理人',
     prop: 'operationUser',
@@ -144,13 +154,13 @@ const tableConfig = reactive({
       prop: 'alarmUnit',
       label: '拨打单位',
       align: 'center',
-      width: 200
+      width: 120
     },
     {
       prop: 'alarmObject',
       label: '拨打对象',
       align: 'center',
-      width: 200
+      width: 100
     },
     {
       prop: 'orderState',
@@ -179,6 +189,19 @@ const tableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',