Explorar el Código

售后服务查询条件更改

jingshuyong hace 1 año
padre
commit
9d078c25b1

+ 11 - 10
src/views/salesServiceManagement/accessory/components/search.vue

@@ -19,7 +19,7 @@ export default {
       return [
         {
           label: '关键字:',
-          value: 'searchName',
+          value: 'keyWord',
           type: 'input',
           placeholder: '编码/物品名称/客户名称/设备名称'
         },
@@ -35,13 +35,13 @@ export default {
           type: 'input',
           placeholder: ''
         },
-        {
-          label: '物品名称:',
-          value: 'categoryName',
-          width: 380,
-          type: 'input',
-          placeholder: ''
-        },
+        // {
+        //   label: '物品名称:',
+        //   value: 'categoryName',
+        //   width: 380,
+        //   type: 'input',
+        //   placeholder: ''
+        // },
         {
           label: this.user == 'recycleName' ? '回收人' : '领用人',
           value: this.user == 'recycleName' ? 'recycleName' : 'recipientName',
@@ -82,7 +82,8 @@ export default {
           value: 'receivingDeptName',
           width: 380,
           type: 'input',
-          placeholder: ''
+          placeholder: '',
+          
         },
         {
           label: '创建时间:',
@@ -91,7 +92,7 @@ export default {
           dateType: 'datetimerange',
           placeholder: '',
           width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
+          valueAr: ['endTime', 'endTime']
         },
       ];
     }

+ 196 - 173
src/views/salesServiceManagement/accessory/index.vue

@@ -18,13 +18,25 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit('', 'add')"
-          >新建</el-button>
+            >新建</el-button
+          >
         </template>
         <template v-slot:code="{ row }">
-          <el-link type="primary" :underline="false" @click="openEdit(row, 'view')">{{ row.code }}</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            @click="openEdit(row, 'view')"
+            >{{ row.code }}</el-link
+          >
         </template>
         <template v-slot:action="{ row }">
-          <el-link type="primary" v-if="row.source == 0" :underline="false" @click="openEdit(row, 'edit')">修改</el-link>
+          <el-link
+            type="primary"
+            v-if="row.source == 0"
+            :underline="false"
+            @click="openEdit(row, 'edit')"
+            >修改</el-link
+          >
           <el-popconfirm
             v-if="row.source == 0"
             class="ele-action"
@@ -32,7 +44,9 @@
             @confirm="handleRemove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">删除</el-link>
+              <el-link type="danger" :underline="false" icon="el-icon-delete"
+                >删除</el-link
+              >
             </template>
           </el-popconfirm>
         </template>
@@ -42,179 +56,188 @@
     <accessoryDialog ref="accessoryDialog" @refresh="reload" />
   </div>
 </template>
-  
-  <script>
-import search from './components/search.vue';
-import accessoryDialog from './components/accessoryDialog.vue';
-import {
-  accessoryPage,
-  accessoryDelete
-  // accessoryUpdate
-} from '@/api/salesServiceManagement/index';
-// import dictMixins from '@/mixins/dictMixins';
-export default {
-  //   mixins: [dictMixins],
-  components: {
-    search,
-    accessoryDialog
-  },
-  data() {
-    return {
-      // 加载状态
-      loading: false
-    };
-  },
-  computed: {
-    columns() {
-      return [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          slot: 'code',
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'orderCode',
-          label: '工单编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
 
-        {
-          prop: 'categoryLevelName',
-          label: '物品分类',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            if (!row.details) return '';
-            let str = '';
-            row.details.map((el, idx) => {
-              if (idx + 1 == row.details.length) {
-                str += el.categoryLevelName;
-              } else {
-                str = el.categoryLevelName
-                  ? str + '' + el.categoryLevelName + ','
-                  : str + '';
-              }
-            });
-            return str;
-          }
-        },
-        // + +关键字
-        {
-          prop: 'categoryName',
-          label: '物品名称',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            if (!row.details) return '';
-            let str = '';
-            row.details.map((el, idx) => {
-              if (idx + 1 == row.details.length) {
-                str += el.categoryName;
-              } else {
-                str = str + '' + el.categoryName + ',';
-              }
-            });
-            return str;
-          }
-        },
-        {
-          prop: 'receivingDeptName',
-          label: '领用部门',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        // + + 时间选择
-        {
-          prop: 'recipientName',
-          label: '领用人',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'contactName',
-          label: '客户名称',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'categoryName',
-          label: '设备名称',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            if (!row.deviceDetails) return '';
-            let str = '';
-            row.deviceDetails.map((el, idx) => {
-              if (idx + 1 == row.deviceDetails.length) {
-                str += el.categoryName;
-              } else {
-                str = str + '' + el.categoryName + ',';
-              }
-            });
-            return str;
-          }
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'usageTime',
-          label: '使用时间',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          columnKey: 'action',
-          slot: 'action',
-          label: '操作',
-          align: 'center',
-          width: 180,
-          resizable: false,
-          showOverflowTooltip: true
-        }
-      ];
-    }
-  },
-  created() {},
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return accessoryPage({ pageNum: page, size: limit, ...where });
+<script>
+  import search from './components/search.vue';
+  import accessoryDialog from './components/accessoryDialog.vue';
+  import {
+    accessoryPage,
+    accessoryDelete
+    // accessoryUpdate
+  } from '@/api/salesServiceManagement/index';
+  // import dictMixins from '@/mixins/dictMixins';
+  export default {
+    //   mixins: [dictMixins],
+    components: {
+      search,
+      accessoryDialog
     },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
+    data() {
+      return {
+        // 加载状态
+        loading: false
+      };
     },
+    computed: {
+      columns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'orderCode',
+            label: '工单编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
 
-    openEdit(row, type) {
-      this.$refs.accessoryDialog.init(row, type);
+          {
+            prop: 'categoryLevelName',
+            label: '物品分类',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (!row.details) return '';
+              let str = '';
+              row.details.map((el, idx) => {
+                if (idx + 1 == row.details.length) {
+                  str += el.categoryLevelName;
+                } else {
+                  str = el.categoryLevelName
+                    ? str + '' + el.categoryLevelName + ','
+                    : str + '';
+                }
+              });
+              return str;
+            }
+          },
+          // + +关键字
+          {
+            prop: 'categoryName',
+            label: '物品名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (!row.details) return '';
+              let str = '';
+              row.details.map((el, idx) => {
+                if (idx + 1 == row.details.length) {
+                  str += el.categoryName;
+                } else {
+                  str = str + '' + el.categoryName + ',';
+                }
+              });
+              return str;
+            }
+          },
+          {
+            prop: 'receivingDeptName',
+            label: '领用部门',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          // + + 时间选择
+          {
+            prop: 'recipientName',
+            label: '领用人',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'contactName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'categoryName',
+            label: '设备名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (!row.deviceDetails) return '';
+              let str = '';
+              row.deviceDetails.map((el, idx) => {
+                if (idx + 1 == row.deviceDetails.length) {
+                  str += el.categoryName;
+                } else {
+                  str = str + '' + el.categoryName + ',';
+                }
+              });
+              return str;
+            }
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'usageTime',
+            label: '使用时间',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            columnKey: 'action',
+            slot: 'action',
+            label: '操作',
+            align: 'center',
+            width: 180,
+            resizable: false,
+            showOverflowTooltip: true
+          }
+        ];
+      }
     },
-    handleRemove(row) {
-      accessoryDelete([row.id]).then((res) => {
-        if (res) {
-          this.$message.success('操作成功!');
-          this.reload();
-        }
-      });
+    created() {},
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return accessoryPage({ pageNum: page, size: limit, ...where });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
+
+      openEdit(row, type) {
+        this.$refs.accessoryDialog.init(row, type);
+      },
+      handleRemove(row) {
+        accessoryDelete([row.id]).then((res) => {
+          if (res) {
+            this.$message.success('操作成功!');
+            this.reload();
+          }
+        });
+      }
     }
-  }
-};
+  };
 </script>
-  
-  <style lang="scss" scoped></style>
-  
+
+<style lang="scss" scoped>
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
+  }
+</style>

+ 1 - 1
src/views/salesServiceManagement/demandList/components/searchTable.vue

@@ -38,7 +38,7 @@ export default {
       return [
         {
           label: '关键字:',
-          value: 'searchName',
+          value: 'keyWord',
           type: 'input',
           placeholder: '客户名称/客户编码/编码/报修编码'
         },

+ 264 - 235
src/views/salesServiceManagement/demandList/index.vue

@@ -18,11 +18,17 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit('', 'add')"
-          >新建</el-button>
+            >新建</el-button
+          >
         </template>
 
         <template v-slot:code="{ row }">
-          <el-link type="primary" :underline="false" @click="openEdit(row, 'view')">{{ row.code }}</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            @click="openEdit(row, 'view')"
+            >{{ row.code }}</el-link
+          >
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
@@ -31,7 +37,8 @@
             :underline="false"
             @click="openEdit(row, 'edit')"
             v-if="row.demandStatus != 1"
-          >修改</el-link>
+            >修改</el-link
+          >
           <el-popconfirm
             v-if="row.demandStatus != 1"
             class="ele-action"
@@ -39,7 +46,9 @@
             @confirm="handleRemove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">删除</el-link>
+              <el-link type="danger" :underline="false" icon="el-icon-delete"
+                >删除</el-link
+              >
             </template>
           </el-popconfirm>
 
@@ -61,7 +70,11 @@
     </el-card>
 
     <!-- 新建或编辑弹窗 -->
-    <AddDialog ref="addDialogRef" :dialogTitle="addDialogTitle" @refresh="reload" />
+    <AddDialog
+      ref="addDialogRef"
+      :dialogTitle="addDialogTitle"
+      @refresh="reload"
+    />
     <!-- 审核弹窗 -->
     <ele-modal
       :centered="true"
@@ -105,7 +118,11 @@
             trigger: 'change'
           }"
         >
-          <el-input v-model="formData.rejectCause" placeholder="请输入" type="textarea"></el-input>
+          <el-input
+            v-model="formData.rejectCause"
+            placeholder="请输入"
+            type="textarea"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="footer">
@@ -117,249 +134,261 @@
 </template>
 
 <script>
-import {
-  getPageSalesDemand,
-  deleteSalesDemand,
-  auditSalesDemand,
-  revokeSalesDemand
-} from '@/api/salesServiceManagement/index.js';
-import search from './components/searchTable.vue';
-import AddDialog from './components/addDialog.vue';
-import { getByCode } from '@/api/system/dictionary-data';
-import dictMixins from '@/mixins/dictMixins';
-export default {
-  mixins: [dictMixins],
-  components: {
-    search,
-    AddDialog
-  },
-  data() {
-    return {
-      // 表格列配置
-      columns: [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          slot: 'code',
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'contactCode',
-          label: '客户编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'contactName',
-          label: '客户名称',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          slot: 'faultLevel',
-          prop: 'faultLevel',
-          label: '故障等级',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            return this.levelData[row.faultLevel] || '';
-          }
-        },
-        {
-          prop: 'createUserName',
-          label: '创建人',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
-          }
-        },
-        {
-          prop: 'approvalUserName',
-          label: '审核人',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'approvalTime',
-          label: '审核时间',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (_row, _column, cellValue) => {
-            return this.$util.toDateString(cellValue);
-          }
-        },
-        {
-          prop: 'demandStatus',
-          label: '状态',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 0
-              ? '待审核'
-              : cellValue == 2
-              ? '已拒绝'
-              : cellValue == 1
-              ? '已通过'
-              : cellValue == 3
-              ? '已撤回'
-              : '';
+  import {
+    getPageSalesDemand,
+    deleteSalesDemand,
+    auditSalesDemand,
+    revokeSalesDemand
+  } from '@/api/salesServiceManagement/index.js';
+  import search from './components/searchTable.vue';
+  import AddDialog from './components/addDialog.vue';
+  import { getByCode } from '@/api/system/dictionary-data';
+  import dictMixins from '@/mixins/dictMixins';
+  export default {
+    mixins: [dictMixins],
+    components: {
+      search,
+      AddDialog
+    },
+    data() {
+      return {
+        // 表格列配置
+        columns: [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
+          {
+            prop: 'contactCode',
+            label: '客户编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'contactName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            slot: 'faultLevel',
+            prop: 'faultLevel',
+            label: '故障等级',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return this.levelData[row.faultLevel] || '';
+            }
+          },
+          {
+            prop: 'createUserName',
+            label: '创建人',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
+          },
+          {
+            prop: 'approvalUserName',
+            label: '审核人',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'approvalTime',
+            label: '审核时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return this.$util.toDateString(cellValue);
+            }
+          },
+          {
+            prop: 'demandStatus',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 0
+                ? '待审核'
+                : cellValue == 2
+                ? '已拒绝'
+                : cellValue == 1
+                ? '已通过'
+                : cellValue == 3
+                ? '已撤回'
+                : '';
+            }
+          },
+          {
+            columnKey: 'action',
+            slot: 'action',
+            label: '操作',
+            align: 'center',
+            width: 230,
+            resizable: false,
+            showOverflowTooltip: true
           }
+        ],
+        // 加载状态
+        loading: false,
+        infoData: {},
+        repairInfoLogs: [],
+        addDialogTitle: '新建售后需求',
+        auditDialog: false,
+
+        rowData: {},
+        formData: {
+          approvalResult: null,
+          rejectCause: '',
+          approvalUserId: '',
+          approvalUserName: ''
         },
-        {
-          columnKey: 'action',
-          slot: 'action',
-          label: '操作',
-          align: 'center',
-          width: 230,
-          resizable: false,
-          showOverflowTooltip: true
+        approvalResultOptions: [
+          { label: '驳回', value: 0 },
+          { label: '同意', value: 1 }
+        ],
+        levelData: {},
+        levelList: []
+      };
+    },
+    computed: {},
+    created() {
+      this.requestDict('报修来源');
+      this.requestDict('报修状态');
+      this.getLevelCode('fault_level');
+    },
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return getPageSalesDemand({ pageNum: page, size: limit, ...where });
+      },
+      async changeEnable(row) {
+        const res = await putRoles(row);
+        if (res.code == 0) {
+          this.$message({
+            type: 'success',
+            message: '修改成功',
+            customClass: 'ele-message-border'
+          });
+          this.reload();
         }
-      ],
-      // 加载状态
-      loading: false,
-      infoData: {},
-      repairInfoLogs: [],
-      addDialogTitle: '新建售后需求',
-      auditDialog: false,
+      },
+      //查询问题等级字典
+      async getLevelCode(code) {
+        const res = await getByCode(code);
+        if (res?.code === '0') {
+          let obj = {};
+          let arr = [];
+          res.data.map((el) => {
+            arr.push({
+              label: Object.values(el)[0],
+              value: Object.keys(el)[0]
+            });
+            obj = { ...obj, ...el };
+          });
+          this.levelList = arr;
+          this.levelData = obj;
+        }
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
 
-      rowData: {},
-      formData: {
-        approvalResult: null,
-        rejectCause: '',
-        approvalUserId: '',
-        approvalUserName: ''
+      openEdit(row, type) {
+        this.$refs.addDialogRef.init(row, type);
       },
-      approvalResultOptions: [
-        { label: '驳回', value: 0 },
-        { label: '同意', value: 1 }
-      ],
-      levelData: {},
-      levelList: [],
 
-    };
-  },
-  computed: {},
-  created() {
-    this.requestDict('报修来源');
-    this.requestDict('报修状态');
-    this.getLevelCode('fault_level');
-  },
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return getPageSalesDemand({ pageNum: page, size: limit, ...where });
-    },
-    async changeEnable(row) {
-      const res = await putRoles(row);
-      if (res.code == 0) {
-        this.$message({
-          type: 'success',
-          message: '修改成功',
-          customClass: 'ele-message-border'
+      handleRemove(row) {
+        deleteSalesDemand([row.id]).then((res) => {
+          this.$message.success('删除成功!');
+          this.reload();
         });
-        this.reload();
-      }
-    },
-    //查询问题等级字典
-    async getLevelCode(code) {
-      const res = await getByCode(code);
-      if (res?.code === '0') {
-        let obj = {};
-        let arr = [];
-        res.data.map((el) => {
-          arr.push({ label: Object.values(el)[0], value: Object.keys(el)[0] });
-          obj = { ...obj, ...el };
-        });
-        this.levelList = arr;
-        this.levelData = obj;
-      }
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
-    },
-
-    openEdit(row, type) {
-      this.$refs.addDialogRef.init(row, type);
-    },
-
-    handleRemove(row) {
-      deleteSalesDemand([row.id]).then((res) => {
-        this.$message.success('删除成功!');
-        this.reload();
-      });
-    },
-    async handleAudit(row) {
-      this.auditDialog = true;
-      this.rowData = row;
-    },
-    handleClose() {
-      this.auditDialog = false;
-    },
-    async handleSubmit() {
-      this.$refs.form.validate(async (valid) => {
-        if (valid) {
-          const data = this.$store.state.user.info;
+      },
+      async handleAudit(row) {
+        this.auditDialog = true;
+        this.rowData = row;
+      },
+      handleClose() {
+        this.auditDialog = false;
+      },
+      async handleSubmit() {
+        this.$refs.form.validate(async (valid) => {
+          if (valid) {
+            const data = this.$store.state.user.info;
 
-          let pdata = {
-            id: this.rowData.id,
-            approvalResult: this.formData.approvalResult,
-            rejectCause: this.formData.rejectCause,
-            approvalUserId: data.userId,
-            approvalUserName: data.name
-          };
-          const res = await auditSalesDemand(pdata);
-          if (res) {
-            this.$message.success('审核成功!');
-            this.auditDialog = false;
-            this.reload();
+            let pdata = {
+              id: this.rowData.id,
+              approvalResult: this.formData.approvalResult,
+              rejectCause: this.formData.rejectCause,
+              approvalUserId: data.userId,
+              approvalUserName: data.name
+            };
+            const res = await auditSalesDemand(pdata);
+            if (res) {
+              this.$message.success('审核成功!');
+              this.auditDialog = false;
+              this.reload();
+            }
           }
+        });
+      },
+      async handleRevoke(row) {
+        const res = await revokeSalesDemand({ id: row.id });
+        if (!res) return;
+        this.$message.success('撤回成功!');
+        this.reload();
+      },
+      handleCommand(command, row) {
+        if (command === 'handleRevoke') {
+          this.handleRevoke(row);
+        }
+        if (command === 'handleAudit') {
+          this.handleAudit(row);
         }
-      });
-    },
-    async handleRevoke(row) {
-      const res = await revokeSalesDemand({ id: row.id });
-      if (!res) return;
-      this.$message.success('撤回成功!');
-      this.reload();
-    },
-    handleCommand(command, row) {
-      if (command === 'handleRevoke') {
-        this.handleRevoke(row);
-      }
-      if (command === 'handleAudit') {
-        this.handleAudit(row);
       }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.el-dropdown-link {
-  cursor: pointer;
-  color: var(--color-primary-5);
-}
+  .el-dropdown-link {
+    cursor: pointer;
+    color: var(--color-primary-5);
+  }
+
+  .el-icon-arrow-down {
+    font-size: 12px;
+  }
 
-.el-icon-arrow-down {
-  font-size: 12px;
-}
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
+  }
 </style>

+ 11 - 10
src/views/salesServiceManagement/evaluate/components/search.vue

@@ -22,9 +22,10 @@ export default {
       return [
         {
           label: '关键字:',
-          value: 'searchName',
+          value: 'keyWord',
           type: 'input',
-          placeholder: '编码/工单编码/客户名称/客户编码'
+          placeholder: '编码/工单编码/客户名称/客户编码',
+          class:'123'
         },
         {
           label: '编码:',
@@ -78,13 +79,13 @@ export default {
           planList: this.serviceList,
           placeholder: '请选择'
         },
-        {
-          label: '创建人:',
-          value: 'createUserName',
-          width: 380,
-          type: 'input',
-          placeholder: ''
-        },
+        // {
+        //   label: '创建人:',
+        //   value: 'createUserName',
+        //   width: 380,
+        //   type: 'input',
+        //   placeholder: ''
+        // },
         {
           label: '创建时间:',
           value: 'createTime',
@@ -92,7 +93,7 @@ export default {
           dateType: 'datetimerange',
           placeholder: '',
           width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
+          valueAr: ['endTime', 'endTime']
         },
       ];
     }

+ 128 - 118
src/views/salesServiceManagement/evaluate/index.vue

@@ -29,128 +29,138 @@
 </template>
 
 <script>
-import search from './components/search.vue';
-import { evaluatePage } from '@/api/salesServiceManagement/index';
+  import search from './components/search.vue';
+  import { evaluatePage } from '@/api/salesServiceManagement/index';
 
-import dictMixins from '@/mixins/dictMixins';
-export default {
-  mixins: [dictMixins],
-  components: {
-    search
-  },
-  data() {
-    return {
-      evaluateStatus: {
-        1: '非常不满意',
-        2: '不满意',
-        3: '一般',
-        4: '满意',
-        5: '非常满意'
-      },
-      // 表格列配置
-
-      // 加载状态
-      loading: false
-    };
-  },
-  computed: {
-    columns() {
-      return [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          slot: 'code',
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'workCode',
-          label: '工单编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'contactName',
-          label: '客户名称',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'contactCode',
-          label: '客户编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'attitudeRating',
-          label: '服务态度评分',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            return this.evaluateStatus[row.attitudeRating];
-          }
-        },
-        {
-          prop: 'responseSpeed',
-          label: '响应速度评分',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            return this.evaluateStatus[row.responseSpeed];
-          }
-        },
-        {
-          prop: 'serviceRating',
-          label: '整体满意度',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            return this.evaluateStatus[row.serviceRating];
-          }
-        },
-        {
-          prop: 'comment',
-          label: '评价内容',
-          align: 'center',
-          showOverflowTooltip: true,
+  import dictMixins from '@/mixins/dictMixins';
+  export default {
+    mixins: [dictMixins],
+    components: {
+      search
+    },
+    data() {
+      return {
+        evaluateStatus: {
+          1: '非常不满意',
+          2: '不满意',
+          3: '一般',
+          4: '满意',
+          5: '非常满意'
         },
+        // 表格列配置
 
-        {
-          prop: 'createUserName',
-          label: '创建人',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center',
-          showOverflowTooltip: true
-        }
-      ];
-    }
-  },
-  created() {},
-  methods: {
-    /* 表格数据源 */
-    datasource({ page, limit, where, order }) {
-      return evaluatePage({ pageNum: page, size: limit, ...where });
+        // 加载状态
+        loading: false
+      };
+    },
+    computed: {
+      columns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'workCode',
+            label: '工单编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'contactName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'contactCode',
+            label: '客户编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'attitudeRating',
+            label: '服务态度评分',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return this.evaluateStatus[row.attitudeRating];
+            }
+          },
+          {
+            prop: 'responseSpeed',
+            label: '响应速度评分',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return this.evaluateStatus[row.responseSpeed];
+            }
+          },
+          {
+            prop: 'serviceRating',
+            label: '整体满意度',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              return this.evaluateStatus[row.serviceRating];
+            }
+          },
+          {
+            prop: 'comment',
+            label: '评价内容',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'createUserName',
+            label: '创建人',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true
+          }
+        ];
+      }
     },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
+    created() {},
+    methods: {
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        return evaluatePage({ pageNum: page, size: limit, ...where });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      }
     }
-  }
-};
+  };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
+  }
+</style>

+ 49 - 45
src/views/salesServiceManagement/knowledge/components/searchTable.vue

@@ -1,57 +1,61 @@
 <!-- 搜索表单 -->
 <template>
-    <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-export default {
+  export default {
     data() {
-        return {};
+      return {};
     },
     props: {
-        user: {
-            type: 'String',
-            default: ''
-        }
+      user: {
+        type: 'String',
+        default: ''
+      },
+      typeOptions: {
+        type: Array,
+        default: () => []
+      }
     },
     computed: {
-        // 表格列配置
-        seekList() {
-            return [
-                {
-                    label: '关键字:',
-                    value: 'code',
-                    type: 'input',
-                    placeholder: '编码/故障原因/'
-                },
-                {
-                    label: '编码:',
-                    value: 'code',
-                    type: 'input',
-                    placeholder: '请输入'
-                },
-                {
-                    label: '故障原因:',
-                    value: 'workCode',
-                    type: 'input',
-                    placeholder: '请输入'
-                },
-                {
-                    label: '故障类型:',
-                    value: 'workCode',
-                    width: 380,
-                    type: 'input',
-                    placeholder: ''
-                },
-            ];
-        }
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字:',
+            value: 'keyWord',
+            type: 'input',
+            placeholder: '编码/故障原因'
+          },
+          {
+            label: '编码:',
+            value: 'code',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '故障原因:',
+            value: 'faultReason',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '故障类型:',
+            value: 'type',
+            planList: this.typeOptions,
+            type: 'select',
+            placeholder: ''
+          }
+        ];
+      }
     },
     methods: {
-        /* 搜索 */
-        search(e) {
-            this.$emit('search', {
-                ...e
-            });
-        }
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-};
-</script>
+  };
+</script>

+ 2 - 2
src/views/salesServiceManagement/knowledge/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
-      <search-table @search="reload"></search-table>
+      <search-table @search="reload" :typeOptions="typeOptions"></search-table>
       <!-- 数据表格 -->
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="systemRoleTable" :pageSize="20">
         <!-- 表头工具栏 -->
@@ -77,7 +77,7 @@ export default {
           showOverflowTooltip: true
         },
         {
-          prop: 'workCode',
+          prop: 'type',
           label: '故障类型',
           align: 'center',
           showOverflowTooltip: true,

+ 108 - 0
src/views/salesServiceManagement/recycle/component/search.vue

@@ -0,0 +1,108 @@
+<!-- 搜索表单 -->
+<template>
+  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
+</template>
+<script>
+  export default {
+    data() {
+      return {};
+    },
+    props: {
+      user: {
+        type: 'String',
+        default: ''
+      }
+    },
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字:',
+            value: 'keyWord',
+            type: 'input',
+            placeholder: '编码/物品名称/客户名称/设备名称'
+          },
+          {
+            label: '编码:',
+            value: 'code',
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '工单编码:',
+            value: 'workCode',
+            type: 'input',
+            placeholder: ''
+          },
+          // {
+          //   label: '物品名称:',
+          //   value: 'categoryName',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: ''
+          // },
+          {
+            label: '回收人',
+            value: 'recycleName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '客户名称:',
+            value: 'contactName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '设备名称:',
+            value: 'deviceName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          // {
+          //   label: '物品分类:',
+          //   value: 'categoryLevelName',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: ''
+          // },
+          {
+            label: '物品名称:',
+            value: 'categoryName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '回收部门:',
+            value: 'recycleDeptName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '创建时间:',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['endTime', 'endTime']
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
+    }
+  };
+</script>

+ 171 - 147
src/views/salesServiceManagement/recycle/index.vue

@@ -18,10 +18,16 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit('', 'add')"
-          >新建</el-button>
+            >新建</el-button
+          >
         </template>
         <template v-slot:code="{ row }">
-          <el-link type="primary" :underline="false" @click="openEdit(row, 'view')">{{ row.code }}</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            @click="openEdit(row, 'view')"
+            >{{ row.code }}</el-link
+          >
         </template>
         <template v-slot:action="{ row }">
           <!-- <el-link
@@ -35,15 +41,21 @@
             type="primary"
             :underline="false"
             @click="openEdit(row, 'edit')"
-          >修改</el-link>
-          <el-popconfirm class="ele-action" title="确定要删除当前故障吗?" @confirm="deleteRecycle(row)">
+            >修改</el-link
+          >
+          <el-popconfirm
+            class="ele-action"
+            title="确定要删除当前故障吗?"
+            @confirm="deleteRecycle(row)"
+          >
             <template v-slot:reference>
               <el-link
                 v-if="row.source == 0"
                 type="danger"
                 icon="el-icon-delete"
                 :underline="false"
-              >删除</el-link>
+                >删除</el-link
+              >
             </template>
           </el-popconfirm>
         </template>
@@ -52,151 +64,163 @@
     <recycleDialog ref="recycleRef" @refresh="reload" />
   </div>
 </template>
-    
-    <script>
-import recycleDialog from './component/recycleDialog.vue';
-import search from '@/views/salesServiceManagement/accessory/components/search.vue';
-import { recyclePage, recycleDelete } from '@/api/salesServiceManagement/index';
-export default {
-  components: {
-    search,
-    recycleDialog
-  },
-  data() {
-    return {
-      // 加载状态
-      loading: false
-    };
-  },
-  computed: {
-    columns() {
-      return [
-        {
-          columnKey: 'index',
-          label: '序号',
-          type: 'index',
-          width: 55,
-          align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
-        },
-        {
-          slot: 'code',
-          prop: 'code',
-          label: '编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'orderWorkCode',
-          label: '工单编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'categoryName',
-          label: '物品名称',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            if (!row.details) return '';
-            let str = '';
-            row.details.map((el, idx) => {
-              if (idx + 1 == row.details.length) {
-                str += el.categoryName;
-              } else {
-                str = str + '' + el.categoryName + ',';
-              }
-            });
-            return str;
+
+<script>
+  import recycleDialog from './component/recycleDialog.vue';
+  import search from './component/search.vue';
+  import {
+    recyclePage,
+    recycleDelete
+  } from '@/api/salesServiceManagement/index';
+  export default {
+    components: {
+      search,
+      recycleDialog
+    },
+    data() {
+      return {
+        // 加载状态
+        loading: false
+      };
+    },
+    computed: {
+      columns() {
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            slot: 'code',
+            prop: 'code',
+            label: '编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'orderWorkCode',
+            label: '工单编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'categoryName',
+            label: '物品名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (!row.details) return '';
+              let str = '';
+              row.details.map((el, idx) => {
+                if (idx + 1 == row.details.length) {
+                  str += el.categoryName;
+                } else {
+                  str = str + '' + el.categoryName + ',';
+                }
+              });
+              return str;
+            }
+          },
+          {
+            prop: 'contactName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'categoryName',
+            label: '设备名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (!row.deviceDetails) return '';
+              let str = '';
+              row.deviceDetails.map((el, idx) => {
+                if (idx + 1 == row.deviceDetails.length) {
+                  str += el.categoryName;
+                } else {
+                  str = str + '' + el.categoryName + ',';
+                }
+              });
+              return str;
+            }
+          },
+          {
+            prop: 'recycleDeptName',
+            label: '回收部门',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          // + + 时间选择
+          {
+            prop: 'recycleName',
+            label: '回收人',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'usageTime',
+            label: '回收时间',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            columnKey: 'action',
+            slot: 'action',
+            label: '操作',
+            align: 'center',
+            width: 180,
+            resizable: false,
+            showOverflowTooltip: true
           }
-        },
-        {
-          prop: 'contactName',
-          label: '客户名称',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'categoryName',
-          label: '设备名称',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (row) => {
-            if (!row.deviceDetails) return '';
-            let str = '';
-            row.deviceDetails.map((el, idx) => {
-              if (idx + 1 == row.deviceDetails.length) {
-                str += el.categoryName;
-              } else {
-                str = str + '' + el.categoryName + ',';
-              }
-            });
-            return str;
+        ];
+      }
+    },
+    created() {},
+    methods: {
+      /* 表格数据源 */
+      async datasource({ page, limit, where, order }) {
+        return recyclePage({ pageNum: page, size: limit, ...where });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
+
+      openEdit(row, type) {
+        this.$refs.recycleRef.init(row, type);
+      },
+      deleteRecycle(row) {
+        recycleDelete([row.id]).then((res) => {
+          if (res) {
+            this.$message.success('操作成功!');
+            this.reload();
           }
-        },
-        {
-          prop: 'recycleDeptName',
-          label: '回收部门',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        // + + 时间选择
-        {
-          prop: 'recycleName',
-          label: '回收人',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'createTime',
-          label: '创建时间',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'usageTime',
-          label: '回收时间',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          columnKey: 'action',
-          slot: 'action',
-          label: '操作',
-          align: 'center',
-          width: 180,
-          resizable: false,
-          showOverflowTooltip: true
-        }
-      ];
+        });
+      }
     }
-  },
-  created() {},
-  methods: {
-    /* 表格数据源 */
-    async datasource({ page, limit, where, order }) {
-      return recyclePage({ pageNum: page, size: limit, ...where });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
-    },
+  };
+</script>
 
-    openEdit(row, type) {
-      this.$refs.recycleRef.init(row, type);
-    },
-    deleteRecycle(row) {
-      recycleDelete([row.id]).then((res) => {
-        if (res) {
-          this.$message.success('操作成功!');
-          this.reload();
-        }
-      });
+<style lang="scss" scoped>
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
     }
   }
-};
-</script>
-    
-  <style lang="scss" scoped></style>
-    
+</style>

+ 1 - 0
src/views/salesServiceManagement/toDoList/components/addOrUpdateDialog.vue

@@ -253,6 +253,7 @@ export default {
     handleClose() {
       this.addForm = { ...def };
       this.visible = false;
+      this.$refs.addFormRef.resetFields();
     },
     // 初始化
     async init(row, type, isDispatch) {

+ 4 - 4
src/views/salesServiceManagement/toDoList/components/plan-search.vue

@@ -55,9 +55,9 @@ export default {
       return [
         {
           label: '关键字:',
-          value: 'searchName',
+          value: 'keyWord',
           type: 'input',
-          placeholder: '计划单号/计划名称/设备名称/创建人'
+          placeholder: '计划单号/计划名称/设备名称'
         },
         {
           label: '计划单号:',
@@ -104,7 +104,7 @@ export default {
         {
           label: '创建人:',
           width: 380,
-          value: 'deviceName',
+          value: 'createUserName',
           type: 'input',
           placeholder: ''
         },
@@ -115,7 +115,7 @@ export default {
           dateType: 'datetimerange',
           placeholder: '',
           width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
+          valueAr: ['startTime', 'endTime']
         },
 
       ];

+ 10 - 0
src/views/salesServiceManagement/toDoList/index.vue

@@ -345,4 +345,14 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
+  }
 </style>

+ 88 - 91
src/views/salesServiceManagement/workOrder/components/work-search.vue

@@ -1,97 +1,94 @@
 <!-- 搜索表单 -->
 <template>
-  <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
+  <seekPage ref="seekPage" :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-export default {
-  data() {
-    return {};
-  },
-  props: {
-    levelList: {
-      type: Array,
-      default: () => []
+  export default {
+    data() {
+      return {};
+    },
+    props: {
+      levelList: {
+        type: Array,
+        default: () => []
+      }
+    },
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字:',
+            value: 'keyWord',
+            type: 'input',
+            placeholder: '单号/客户名称/设备名称'
+          },
+          {
+            label: '工单编号:',
+            value: 'code',
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '客户名称:',
+            value: 'contactName',
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '设备名称:',
+            value: 'deviceName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '故障等级:',
+            value: 'faultLevel',
+            width: 380,
+            type: 'select',
+            planList: this.levelList,
+            placeholder: ''
+          },
+          {
+            label: '计划单号:',
+            value: 'planCode',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '计划名称:',
+            value: 'planName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '报工人:',
+            value: 'executeUserName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          },
+          {
+            label: '验收人:',
+            value: 'accepterUserName',
+            width: 380,
+            type: 'input',
+            placeholder: ''
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        console.log(e, 'eeeeeeeeee');
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-  },
-  computed: {
-    // 表格列配置
-    seekList() {
-      return [
-        {
-          label: '关键字:',
-          value: 'searchName',
-          type: 'input',
-          placeholder: '单号/客户名称/设备名称'
-        },
-        {
-          label: '工单编号:',
-          value: 'code',
-          type: 'input',
-          placeholder: ''
-        },
-        {
-          label: '客户名称:',
-          value: 'contactName',
-          type: 'input',
-          placeholder: ''
-        },
-        {
-          label: '设备名称:',
-          value: 'deviceName',
-          width: 380,
-          type: 'input',
-          placeholder: ''
-        },
-        {
-          label: '故障等级:',
-          value: 'faultLevel',
-          width: 380,
-          type: 'select',
-          planList: this.levelList,
-          placeholder: ''
-        }, 
-        {
-          label: '计划单号:',
-          value: 'planCode',
-          width: 380,
-          type: 'select',
-          planList: this.levelList,
-          placeholder: ''
-        },
-        {
-          label: '计划名称:',
-          value: 'planName',
-          width: 380,
-          type: 'select',
-          planList: this.levelList,
-          placeholder: ''
-        },
-        {
-          label: '报工人:',
-          value: 'executeUserName',
-          width: 380,
-          type: 'select',
-          planList: this.levelList,
-          placeholder: ''
-        },
-        {
-          label: '验收人:',
-          value: 'accepterUserName',
-          width: 380,
-          type: 'select',
-          planList: this.levelList,
-          placeholder: ''
-        }
-      ];
-    }
-  },
-  methods: {
-    /* 搜索 */
-    search(e) {
-      this.$emit('search', {
-        ...e
-      });
-    }
-  }
-};
+  };
 </script>

+ 15 - 4
src/views/salesServiceManagement/workOrder/index.vue

@@ -412,7 +412,8 @@
     },
     methods: {
       handleClick(e) {
-        this.reload({});
+        let where = this.$refs.workSearch.$refs.seekPage.defaultWhere || {};
+        this.reload(where);
       },
       //查询问题等级字典
       async getLevelCode(code) {
@@ -437,11 +438,14 @@
       },
       /* 刷新表格 */
       reload(where) {
-        console.log(where, 'where');
-        console.log(this.orderStatus, 'orderStatus');
         // 判断如果是选择的全部 不用传参
         if (this.orderStatus == 'all') {
-          where = where ? delete where.orderStatus : '';
+          console.log(this.orderStatus, 'this.orderStatus ====');
+          // where = where ? delete where.orderStatus : '';
+          console.log(where, 'where');
+          if (where) {
+            delete where.orderStatus;
+          }
           return this.$refs.table.reload({ page: 1, where });
         }
         // 不是的话 赋值工单状态
@@ -559,4 +563,11 @@
   .el-icon-arrow-down {
     font-size: 12px;
   }
+
+
+  ::v-deep {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
+  }
 </style>