修改禅道1891

src/api/tirePartsMall/purchaseService/outboundWorkOrder.js

@@ -17,12 +17,12 @@ export const remove = (id) => {
     }
   })
 }
-export const tradingBox = (id) => {
+export const tradingBox = (ids) => {
   return request({
     url: '/api/blade-sales-part/shipItems/remove',
-    method: 'post',
-    data: {
-      id
+    method: 'get',
+    params: {
+      ids
     }
   })
 }

src/api/tirePartsMall/salesService/outboundWorkOrder.js

@@ -17,12 +17,12 @@ export const remove = (id) => {
     }
   })
 }
-export const tradingBox = (id) => {
+export const tradingBox = (ids) => {
   return request({
     url: '/api/blade-sales-part/shipItems/remove',
-    method: 'post',
-    data: {
-      id
+    method: 'get',
+    params: {
+      ids
     }
   })
 }

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -153,7 +153,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -185,7 +185,7 @@ export default {
                     }
                 ],
                 column: [{
-                    label: '客户名称',
+                    label: '供应商名称',
                     prop: 'customerName',
                     overHidden: true,
                     search: true,
@@ -203,7 +203,7 @@ export default {
                     prop: 'storageName',
                     overHidden: true,
                 }, {
-                    label: '销售单号',
+                    label: '采购单号',
                     prop: 'ordNo',
                     overHidden: true,
                     search: true,
@@ -264,15 +264,18 @@ export default {
                     label: '余额',
                     prop: 'balanceAmount',
                     overHidden: true,
-                }, {
-                    label: '成本',
-                    prop: 'costprie',
-                    overHidden: true,
-                }, {
-                    label: '毛利',
-                    prop: 'profit',
-                    overHidden: true,
-                }, {
+                },
+                //  {
+                //     label: '成本',
+                //     prop: 'costprie',
+                //     overHidden: true,
+                // }, 
+                // {
+                //     label: '毛利',
+                //     prop: 'profit',
+                //     overHidden: true,
+                // }, 
+                {
                     label: '业务开始',
                     prop: 'businesDateStart',
                     overHidden: true,
@@ -282,7 +285,8 @@ export default {
                     type: "date",
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
-                }, {
+                }, 
+                {
                     label: '业务结束',
                     prop: 'businesDateEnd',
                     overHidden: true,
@@ -292,7 +296,8 @@ export default {
                     type: "date",
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
-                }, {
+                },
+                {
                     label: '单据状态',
                     prop: 'status',
                     overHidden: true,
@@ -319,37 +324,45 @@ export default {
             // 合计的配置项
             commodityLabel: [{
                 id: 1,
-                label: '销售数量',
+                label: '采购数量',
                 prop: 'goodsSum'
-            }, {
+            }, 
+            {
                 id: 2,
-                label: '销售金额',
+                label: '采购金额',
                 prop: 'amount'
-            }, {
-                id: 3,
-                label: '销售成本',
-                prop: 'costprie'
-            }, {
-                id: 4,
-                label: '销售毛利',
-                prop: 'profit'
-            }, {
+            }, 
+            // {
+            //     id: 3,
+            //     label: '采购成本',
+            //     prop: 'costprie'
+            // }, 
+            // {
+            //     id: 4,
+            //     label: '采购毛利',
+            //     prop: 'profit'
+            // }, 
+            {
                 id: 5,
                 label: '已取消数量',
                 prop: 'goodsSumCancellation'
-            }, {
+            }, 
+            {
                 id: 6,
                 label: '已取消金额',
                 prop: 'amountCancellation'
-            }, {
-                id: 7,
-                label: '已取消成本',
-                prop: 'costprieCancellation'
-            }, {
-                id: 8,
-                label: '已取消毛利',
-                prop: 'profitCancellation'
-            }],
+            }, 
+            // {
+            //     id: 7,
+            //     label: '已取消成本',
+            //     prop: 'costprieCancellation'
+            // }, 
+            // {
+            //     id: 8,
+            //     label: '已取消毛利',
+            //     prop: 'profitCancellation'
+            // }
+        ],
         }
     },
     async created() {
@@ -383,6 +396,7 @@ export default {
                 path: '/api/blade-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
                 query: {
                     ...config.params,    //括号内是要传递给新窗口的参数
+                    bsType:'CG,TKCG',
                 }
             })
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -153,7 +153,7 @@ export default {
                 // searchIndex: 2,
                 // highlightCurrentRow: true,
                 border: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 addBtn: false,
                 showSummary: true,
                 summaryText: "合计",
@@ -387,6 +387,7 @@ export default {
                 path: '/api/blade-sales-part/statistics/saleDetailExport',   //跳转目标窗口的地址
                 query: {
                     ...config.params,    //括号内是要传递给新窗口的参数
+                    bsType:'XS,TKXS',
                 }
             })
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);

src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -38,11 +38,11 @@
                 <!--<el-button :size="size" :disabled="disabled || isAddDisabled" :type="type"-->
                 <!--  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">编辑-->
                 <!--</el-button>-->
-                  <el-button :size="size" :disabled="disabled || isDisabled" :type="type"
+                  <!-- <el-button :size="size" :disabled="disabled || isDisabled" :type="type"
                              :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
                       {{row.$cellEdit?'保存':'编辑'}}
-                  </el-button>
-                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled" :type="type"
+                  </el-button> -->
+                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled ||form.statusName=='已出库'" :type="type"
                   @click="rowDelBox(row, index)">删除
                 </el-button>
               </template>
@@ -258,7 +258,7 @@ export default {
         addRowBtn: false,
         editBtn: false,
         delBtn: false,
-        menuWidth: 140,
+        menuWidth: 80,
         dialogTop: 25,
         dialogWidth: "80%",
         showSummary: true,

src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -117,7 +117,9 @@ export default {
       courierList: [],
       detailsOpen: false,
       loading: false,
-      search: {},
+      search: {
+        statusName:'待出库'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -471,6 +473,9 @@ export default {
         this.loading = false
       }).finally(() => {
         this.loading = false
+        if(this.search.statusName==''){
+          this.search.statusName='待出库'
+        }
       })
     },
     editOpen(row, status) {

src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -15,11 +15,11 @@
                 </el-button>
                 <el-button v-if="form.id && form.status == '待确认'" type="success" :loading="buttonLoading" size="small"
                     @click.native="generateTask">
-                   生成退单任务
+                    生成退单任务
                 </el-button>
-                <el-button v-if="form.generateTask=='已生成' && form.status == '待入库'" type="success" :loading="buttonLoading" size="small"
-                    @click.native="revokeGenerateTask">
-                   撤销退单任务
+                <el-button v-if="form.generateTask == '已生成' && form.status == '待出库'" type="success" :loading="buttonLoading"
+                    size="small" @click.native="revokeGenerateTask">
+                    撤销退单任务
                 </el-button>
                 <el-button v-if="form.id && form.status == '录入'" type="danger" :loading="buttonLoading" size="small"
                     @click.native="applySettlement('申请')">
@@ -80,7 +80,8 @@
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
-                                <el-button type="danger" plain size="small" @click="batchDelete">一键删除</el-button>
+                                <el-button type="danger" plain size="small" @click="batchDelete"
+                                    :disabled="form.checkStatus != '录入' || editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}
@@ -99,8 +100,8 @@
                                 <el-button v-else :size="size" :disabled="disabled" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="inSave(row, index)">保存
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="form.status != '录入'"
-                                    :type="type" @click="rowDelBox(row, index, 'orderItemsList')">删除
+                                <el-button icon="el-icon-delete" :size="size" :disabled="form.status != '录入'" :type="type"
+                                    @click="rowDelBox(row, index, 'orderItemsList')">删除
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -111,7 +112,7 @@
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 354)"
                             @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 354)">
                         </avue-crud>
-                      
+
                     </el-tab-pane>
                     <el-tab-pane label="历史记录" name="outbound_records">
                         <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
@@ -263,7 +264,7 @@ export default {
                 businesDate: '',
                 orderItemsList: [],
                 outboundRecordsList: [],
-                orderRecordList:[]
+                orderRecordList: []
             },
             customerData: [], // 客户数据
             optionForm: {
@@ -400,11 +401,28 @@ export default {
                 addRowBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menuWidth: 140,
+                menuWidth: 120,
                 dialogTop: 25,
                 dialogWidth: "80%",
                 showSummary: true,
                 selection: true,
+                summaryText: "合计",
+                sumColumnList: [{
+                    name: 'inventory',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'goodsNum',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'returnsNumber',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'returnsAmount',
+                    type: 'sum',
+                }],
                 column: [
                     //  {
                     //     label: '商品名称',
@@ -434,7 +452,7 @@ export default {
                     {
                         label: '商品名称',
                         prop: 'goodsName',
-                        width: 250,
+                        width: 300,
                         disabled: false,
                         remote: true,
                         overHidden: true,
@@ -468,7 +486,7 @@ export default {
                     {
                         label: '库存',
                         prop: 'inventory',
-                        width: 250,
+                        width: 100,
                         disabled: false,
                         remote: true,
                         overHidden: true,
@@ -532,7 +550,7 @@ export default {
                 }, {
                     label: '经手人',
                     prop: 'createUserName'
-                },  {
+                }, {
                     label: '时间',
                     prop: 'createTime'
                 }]
@@ -683,7 +701,6 @@ export default {
             console.log(1111)
             this.$refs["form"].validate((valid, done) => {
                 done();
-                console.log(121212,valid)
                 if (valid) {
                     console.log(123)
                     this.mingxibaocun = true
@@ -735,7 +752,7 @@ export default {
             this.isExamineBtn = !this.isExamineBtn
             this.checkDialog = false;
         },
-        generateTask(){
+        generateTask() {
             this.$confirm("您确定生成任务吗?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -747,14 +764,14 @@ export default {
                     spinner: 'el-icon-loading',
                     background: 'rgba(255,255,255,0.7)'
                 });
-                generateShipTask({id:this.form.id}).then((res) => {
+                generateShipTask({ id: this.form.id }).then((res) => {
                     loading.close()
                     this.$message.success('生成成功');
                     this.getDetail(this.form.id)
                 }).catch(() => { loading.close(); })
             })
         },
-        revokeGenerateTask(){
+        revokeGenerateTask() {
             this.$confirm("您确定撤销任务吗?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -766,7 +783,7 @@ export default {
                     spinner: 'el-icon-loading',
                     background: 'rgba(255,255,255,0.7)'
                 });
-                revokeGenerateShipTask({id:this.form.id}).then((res) => {
+                revokeGenerateShipTask({ id: this.form.id }).then((res) => {
                     loading.close()
                     this.$message.success('撤销成功');
                     this.getDetail(this.form.id)

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -15,6 +15,9 @@
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
+        <template slot="notCompleteSearch">
+          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+        </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <!-- <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button> -->
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
@@ -188,17 +191,17 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          {
-            label: '状态',
-            prop: "returnsStatus",
-            overHidden: true,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            }
-          },
+          // {
+          //   label: '状态',
+          //   prop: "returnsStatus",
+          //   overHidden: true,
+          //   type: 'select',
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   }
+          // },
           {
             label: "制单人",
             prop: "createUserName",
@@ -241,6 +244,14 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             hide: true,
             showColumn: false
+          },
+          {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
           }]
       }
     }

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -63,7 +63,9 @@ export default {
       storageNameList: [],
       stockClerkNameList: [],
       loading: false,
-      search: {},
+      search: {
+        statusName:'待入库'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -453,7 +455,7 @@ export default {
         bizTypeName: "SHGD,TKSHGD",
         ...Object.assign(params, searchWithoutStorageName),
         storageId: storageId,
-        statusName: this.search.$statusName,
+        // statusName: this.search.$statusName,
         stockClerkName: this.search.$stockClerkName
       };
       delete params.storageName;
@@ -481,6 +483,9 @@ export default {
         })
         this.loading = false
       }).finally(() => {
+        if(this.search.statusName==''){
+          this.search.statusName='待入库'
+        }
         this.loading = false
       })
     },

src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -117,7 +117,9 @@ export default {
       courierList: [],
       detailsOpen: false,
       loading: false,
-      search: {},
+      search: {
+        statusName:'待出库'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -468,6 +470,10 @@ export default {
         })
         this.loading = false
       }).finally(() => {
+        if(this.search.statusName==''){
+          this.search.statusName='待出库'
+        }
+        console.log(this.search)
         this.loading = false
       })
     },

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -18,7 +18,7 @@
                     {{ buttonText }}
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
-                    :disabled="form.status != '已收货'" @click="getReturns">
+                    :disabled="form.status != '已收货'||form.returnsNumber==form.goodsTotalNum||editButton" @click="getReturns">
                     生成采购退货
                 </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -18,8 +18,9 @@
                     :disabled="isDisabledTask" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
+                
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
-                    :disabled="form.status!='已发货'" @click="getReturns">
+                    :disabled="form.status!='已发货'||form.returnsNumber==form.goodsTotalNum||editButton" @click="getReturns">
                     生成销售退货
                 </el-button>
 

src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -46,10 +46,10 @@
                           <!--</template>-->
 
                           <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                              <el-button :size="size" :disabled="disabled || isEdit" :type="type"
+                              <!-- <el-button :size="size" :disabled="disabled || isEdit" :type="type"
                                   :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
                                   {{row.$cellEdit?'保存':'编辑'}}
-                              </el-button>
+                              </el-button> -->
                               <el-button icon="el-icon-delete" :size="size"
                                   :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits" :type="type"
                                   @click="rowDelBox(row, index)">删除
@@ -60,8 +60,8 @@
                                   :disabled="isrowAdd">添加商品</el-button>
                               <el-button type="success" size="small" :disabled="isrowAdd" icon="el-icon-bottom" @click="excelBox = true">导入
                               </el-button> -->
-                              <el-button type="primary" icon="el-icon-printer" size="small"
-                                  @click="handlePrint">打印</el-button>
+                              <!-- <el-button type="primary" icon="el-icon-printer" size="small"
+                                  @click="handlePrint">打印</el-button> -->
                               <el-button type="danger" plain size="small"
                                          :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits"
                                          @click="batchDelete" >一键删除</el-button>
@@ -325,7 +325,7 @@ export default {
               editBtn: false, // 修改按钮
               delBtn: false, //删除按钮
               border: true,
-              menuWidth: 160,
+              menuWidth: 80,
               stripe: true,
               span: 8,
               addRowBtn:false,

src/views/tirePartsMall/salesService/inStorage/index.vue

@@ -63,7 +63,9 @@ export default {
       storageNameList: [],
       stockClerkNameList: [],
       loading: false,
-      search: {},
+      search: {
+        statusName:'待入库'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -447,7 +449,7 @@ export default {
         bizTypeName: "THSHGD",
         ...Object.assign(params, searchWithoutStorageName),
         storageId: storageId,
-        statusName: this.search.$statusName,
+        // statusName: this.search.$statusName,
         stockClerkName: this.search.$stockClerkName
       };
       delete params.storageName;
@@ -475,6 +477,9 @@ export default {
         })
         this.loading = false
       }).finally(() => {
+        if(this.search.statusName==''){
+          this.search.statusName='待入库'
+        }
         this.loading = false
       })
     },

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -15,11 +15,11 @@
                 </el-button>
                 <el-button v-if="form.id && form.status == '待确认'" type="success" :loading="buttonLoading" size="small"
                     @click.native="generateTask">
-                   生成退单任务
+                    生成退单任务
                 </el-button>
-                <el-button v-if="form.generateTask=='已生成' && form.status == '待入库'" type="success" :loading="buttonLoading" size="small"
-                    @click.native="revokeGenerateTask">
-                   撤销退单任务
+                <el-button v-if="form.generateTask == '已生成' && form.status == '待入库'" type="success" :loading="buttonLoading"
+                    size="small" @click.native="revokeGenerateTask">
+                    撤销退单任务
                 </el-button>
                 <el-button v-if="form.id && form.status == '录入'" type="danger" :loading="buttonLoading" size="small"
                     @click.native="applySettlement('申请')">
@@ -78,9 +78,10 @@
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 343)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 343)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
-                                <el-button type="primary" icon="el-icon-printer" size="small"
-                                    @click="handlePrint">打印</el-button>
-                                <el-button type="danger" plain size="small" @click="batchDelete">一键删除</el-button>
+                                <!-- <el-button type="primary" icon="el-icon-printer" size="small"
+                                    @click="handlePrint">打印</el-button> -->
+                                <el-button type="danger" plain size="small" @click="batchDelete"
+                                    :disabled="form.checkStatus != '录入'||editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 {{ row.goodsName }}
@@ -99,8 +100,8 @@
                                 <el-button v-else :size="size" :disabled="disabled" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="inSave(row, index)">保存
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="form.status != '录入'"
-                                    :type="type" @click="rowDelBox(row, index, 'orderItemsList')">删除
+                                <el-button icon="el-icon-delete" :size="size" :disabled="form.status != '录入'" :type="type"
+                                    @click="rowDelBox(row, index, 'orderItemsList')">删除
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -111,7 +112,7 @@
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 345)"
                             @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 345)">
                         </avue-crud>
-                      
+
                     </el-tab-pane>
                     <el-tab-pane label="历史记录" name="outbound_records">
                         <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
@@ -263,7 +264,7 @@ export default {
                 businesDate: '',
                 orderItemsList: [],
                 outboundRecordsList: [],
-                orderRecordList:[]
+                orderRecordList: []
             },
             customerData: [], // 客户数据
             optionForm: {
@@ -400,11 +401,28 @@ export default {
                 addRowBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menuWidth: 140,
+                menuWidth: 120,
                 dialogTop: 25,
                 dialogWidth: "80%",
                 showSummary: true,
                 selection: true,
+                summaryText: "合计",
+                sumColumnList: [{
+                    name: 'inventory',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'goodsNum',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'returnsNumber',
+                    type: 'sum',
+                    decimals: 0
+                }, {
+                    name: 'returnsAmount',
+                    type: 'sum',
+                }],
                 column: [
                     //  {
                     //     label: '商品名称',
@@ -434,7 +452,7 @@ export default {
                     {
                         label: '商品名称',
                         prop: 'goodsName',
-                        width: 250,
+                        width: 300,
                         disabled: false,
                         remote: true,
                         overHidden: true,
@@ -468,7 +486,7 @@ export default {
                     {
                         label: '库存',
                         prop: 'inventory',
-                        width: 250,
+                        width: 100,
                         disabled: false,
                         remote: true,
                         overHidden: true,
@@ -532,7 +550,7 @@ export default {
                 }, {
                     label: '经手人',
                     prop: 'createUserName'
-                },  {
+                }, {
                     label: '时间',
                     prop: 'createTime'
                 }]
@@ -731,7 +749,7 @@ export default {
             this.isExamineBtn = !this.isExamineBtn
             this.checkDialog = false;
         },
-        generateTask(){
+        generateTask() {
             this.$confirm("您确定生成任务吗?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -743,14 +761,14 @@ export default {
                     spinner: 'el-icon-loading',
                     background: 'rgba(255,255,255,0.7)'
                 });
-                generateShipTask({id:this.form.id}).then((res) => {
+                generateShipTask({ id: this.form.id }).then((res) => {
                     loading.close()
                     this.$message.success('生成成功');
                     this.getDetail(this.form.id)
                 }).catch(() => { loading.close(); })
             })
         },
-        revokeGenerateTask(){
+        revokeGenerateTask() {
             this.$confirm("您确定撤销任务吗?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -762,7 +780,7 @@ export default {
                     spinner: 'el-icon-loading',
                     background: 'rgba(255,255,255,0.7)'
                 });
-                revokeGenerateShipTask({id:this.form.id}).then((res) => {
+                revokeGenerateShipTask({ id: this.form.id }).then((res) => {
                     loading.close()
                     this.$message.success('撤销成功');
                     this.getDetail(this.form.id)

src/views/tirePartsMall/salesService/returns/index.vue

@@ -8,13 +8,15 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 342)" :page.sync="page">
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
-          <el-button :size="size" :type="type"
-            :disabled="row.status != '录入'"
+          <el-button :size="size" :type="type" :disabled="row.status != '录入'"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
+        <template slot="notCompleteSearch">
+          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+        </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <!-- <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button> -->
           <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
@@ -188,17 +190,17 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
-          {
-            label: '状态',
-            prop: "returnsStatus",
-            overHidden: true,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            }
-          },
+          // {
+          //   label: '状态',
+          //   prop: "returnsStatus",
+          //   overHidden: true,
+          //   type: 'select',
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=sales_Status",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   }
+          // },
           {
             label: "制单人",
             prop: "createUserName",
@@ -241,6 +243,14 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             hide: true,
             showColumn: false
+          },
+          {
+            label: '显示已完成',
+            prop: 'notComplete',
+            overHidden: true,
+            hide: true,
+            search: true,
+            searchslot: true
           }]
       }
     }