fix(accessory): 优化操作按钮显示条件并添加派车单筛选参数

src/views/salesServiceManagement/accessory/index.vue

@@ -34,7 +34,9 @@
           <el-link
             type="primary"
             v-if="
-              row.source == 0 && $hasPermission('eom:sparepartsapply:update') &&!(row.approvalStatus === 1 || row.approvalStatus === 2)
+              row.source == 0 &&
+              $hasPermission('eom:sparepartsapply:update') &&
+              !(row.approvalStatus === 1 || row.approvalStatus === 2)
             "
             :underline="false"
             @click="openEdit(row, 'edit')"
@@ -52,10 +54,7 @@
           >
           <el-link
             type="primary"
-            v-if="
-              row.source == 0 &&
-              !(row.approvalStatus === 1 || row.approvalStatus === 2)
-            "
+            v-if="!(row.approvalStatus === 1 || row.approvalStatus === 2)"
             :underline="false"
             @click="openProcess(row)"
             >发起流程</el-link
@@ -96,234 +95,234 @@
 </template>
 
 <script>
-import search from './components/search.vue';
-import accessoryDialog from './components/accessoryDialog.vue';
-import returnAddDiaLog from '@/views/salesServiceManagement/return/component/recycleDialog.vue';
+  import search from './components/search.vue';
+  import accessoryDialog from './components/accessoryDialog.vue';
+  import returnAddDiaLog from '@/views/salesServiceManagement/return/component/recycleDialog.vue';
 
-import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
+  import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
 
-import {
-  accessoryPage,
-  accessoryDelete
-  // accessoryUpdate
-} from '@/api/salesServiceManagement/index';
-// import dictMixins from '@/mixins/dictMixins';
-export default {
-  //   mixins: [dictMixins],
-  components: {
-    search,
-    accessoryDialog,
-    returnAddDiaLog,
-    processSubmitDialog
-  },
-  data() {
-    return {
-      // 加载状态
-      loading: false,
-      processSubmitDialogFlag: false, // 加载状态 弹窗
-      outboundDetailsDialogFlag: 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: 'demandCode',
-          label: '售后需求编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'orderCode',
-          label: '工单编码',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'approvalStatus',
-          label: '审核状态',
-          align: 'center',
-          showOverflowTooltip: true,
-          formatter: (_row, _column, cellValue) => {
-            return cellValue == 0
-              ? '未提交'
-              : cellValue == 1
-              ? '审核中'
-              : cellValue == 2
-              ? '审核通过'
-              : cellValue == 3
-              ? '审核不通过'
-              : '';
-          }
-        },
-        {
-          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
-        },
-        {
-          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 });
-    },
-    /* 刷新表格 */
-    reload(where) {
-      this.$refs.table.reload({ page: 1, where });
+  import {
+    accessoryPage,
+    accessoryDelete
+    // accessoryUpdate
+  } from '@/api/salesServiceManagement/index';
+  // import dictMixins from '@/mixins/dictMixins';
+  export default {
+    //   mixins: [dictMixins],
+    components: {
+      search,
+      accessoryDialog,
+      returnAddDiaLog,
+      processSubmitDialog
     },
-
-    openEdit(row, type) {
-      this.$refs.accessoryDialog.init(row, type);
+    data() {
+      return {
+        // 加载状态
+        loading: false,
+        processSubmitDialogFlag: false, // 加载状态 弹窗
+        outboundDetailsDialogFlag: false //
+      };
     },
-    handleRemove(row) {
-      accessoryDelete([row.id]).then((res) => {
-        if (res) {
-          this.$message.success('操作成功!');
-          this.reload();
-        }
-      });
-    },
-    returnAdd(row) {
-      this.$refs.returnAddDiaLogRef.init(row, 'add', 'accessory');
+    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: 'demandCode',
+            label: '售后需求编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'orderCode',
+            label: '工单编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'approvalStatus',
+            label: '审核状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return cellValue == 0
+                ? '未提交'
+                : cellValue == 1
+                ? '审核中'
+                : cellValue == 2
+                ? '审核通过'
+                : cellValue == 3
+                ? '审核不通过'
+                : '';
+            }
+          },
+          {
+            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
+          },
+          {
+            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 });
+      },
+      /* 刷新表格 */
+      reload(where) {
+        this.$refs.table.reload({ page: 1, where });
+      },
 
-    openProcess(data) {
-      this.processSubmitDialogFlag = true;
-      this.$nextTick(() => {
-        let params = {
-          businessId: data.id,
-          businessKey: 'eom_sh_bpbj',
-          formCreateUserId: data.createUserId,
-          variables: {
-            businessCode: data.code,
-            businessName: data.receivingDeptName,
-            businessType: '申请备品备件'
+      openEdit(row, type) {
+        this.$refs.accessoryDialog.init(row, type);
+      },
+      handleRemove(row) {
+        accessoryDelete([row.id]).then((res) => {
+          if (res) {
+            this.$message.success('操作成功!');
+            this.reload();
           }
-        };
-        this.$refs.processSubmitDialogRef.init(params);
-      });
+        });
+      },
+      returnAdd(row) {
+        this.$refs.returnAddDiaLogRef.init(row, 'add', 'accessory');
+      },
+
+      openProcess(data) {
+        this.processSubmitDialogFlag = true;
+        this.$nextTick(() => {
+          let params = {
+            businessId: data.id,
+            businessKey: 'eom_sh_bpbj',
+            formCreateUserId: data.createUserId,
+            variables: {
+              businessCode: data.code,
+              businessName: data.receivingDeptName,
+              businessType: '申请备品备件'
+            }
+          };
+          this.$refs.processSubmitDialogRef.init(params);
+        });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-input__inner::placeholder {
-  font-size: 13px;
-}
-::v-deep .seep-search {
-  .el-input__inner {
-    padding: 0 5px 0 10px;
+  ::v-deep .el-input__inner::placeholder {
+    font-size: 13px;
+  }
+  ::v-deep .seep-search {
+    .el-input__inner {
+      padding: 0 5px 0 10px;
+    }
   }
-}
 </style>

src/views/salesServiceManagement/components/processSubmitDialog/processSubmitDialog.vue

@@ -177,6 +177,7 @@
     <SHGDListDialog
       ref="SHGDListDialogRef"
       @changeParent="getSHGDData"
+      :isPieCar="1"
     ></SHGDListDialog>
   </ele-modal>
 </template>

src/views/salesServiceManagement/demandList/index.vue

@@ -289,7 +289,6 @@
         addDialogTitle: '新建售后需求',
         rowData: {},
         formData: {
-          approvalResult: null,
           rejectCause: '',
           approvalUserId: '',
           approvalUserName: ''

src/views/salesServiceManagement/workOrder/components/drawer.vue

@@ -68,6 +68,9 @@ export default {
   components: {
     workSearch
   },
+  props: {
+    isPieCar:''
+  },  
   data() {
     return {
       visible: false,
@@ -231,6 +234,9 @@ export default {
       this.loading = true;
       
       // let isDispatch = '1';
+      if(this.isPieCar){
+        where['isPieCar'] = this.isPieCar
+      }
       const params = {
         pageNum: page,
         size: limit,