前端物料组更改，先前交给实习生做的有问题，自己又改一遍

vue/src/router/modules/vw_menu.js

@@ -41,7 +41,7 @@ const vwMenudataRouter = {
                     meta: {
                         title: 'FIS结算明细',
                         roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-                        icon: '结算'
+                        icon: '库存'
                     }
                 },
                 {
@@ -59,9 +59,9 @@ const vwMenudataRouter = {
                     component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'),
                     name: 'VWKanBan',//命名路由
                     meta: {
-                        title: '大众看板结算明细',
+                        title: '大众看板结算导入',
                         roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色）
-                        icon: '发运'
+                        icon: '看板'
                     }
                 },
                 {
@@ -69,9 +69,9 @@ const vwMenudataRouter = {
                     component: () => import('@/views/ux/vw/dataInput/SparePart'),
                     name: 'SparePart',//命名路由
                     meta: {
-                        title: '大众备件结算明细导入',
+                        title: '大众备件结算导入',
                         roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色）
-                        icon: '结算'
+                        icon: '工厂'
                     }
                 },
                 {
@@ -104,7 +104,7 @@ const vwMenudataRouter = {
                     meta: {
                         title: '发票与结算核对汇总',
                         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '结算对比'
+                        icon: '结算'
                     }
                 },
                 {
@@ -122,7 +122,7 @@ const vwMenudataRouter = {
                     component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),
                     name: 'UnInvoiceSettledDetailDiff',//命名路由
                     meta: {
-                        title: '准时化量差输出',
+                        title: '准时化量差价差输出',
                         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
                         icon: '售后'
                     }
@@ -132,19 +132,29 @@ const vwMenudataRouter = {
                     component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
                     name: 'UnSettleDiffExport',//命名路由
                     meta: {
-                        title: '准时化未结差异比对输出',
+                        title: '准时化未结核对',
                         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-                        icon: '售后'
+                        icon: '器具'
                     }
                 },
+                {
+                    path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识）
+                    component: () => import('@/views/ux/billManage/IssuedUnsettled/index'),
+                    name: 'UnsettledDetail',//命名路由
+                    meta: {
+                      title: '准时化未结明细',
+                      roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+                      icon: '报表'
+                    }
+                  },
                 {
                     path: '/kbwithcode',
                     component: () => import('@/views/ux/billManage/kanBanWithCode'),
                     name: 'KanBanWithCode',//命名路由
                     meta: {
-                        title: '看板结算数量差异输出',
+                        title: '看板结算输出',
                         //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色）
-                        icon: '对比'
+                        icon: '看板'
                     }
                 },
 
@@ -153,9 +163,9 @@ const vwMenudataRouter = {
                     component: () => import('@/views/ux/billManage/sparePart'),
                     name: 'SparePartReport',//命名路由
                     meta: {
-                        title: '备件结算数量差异输出',
+                        title: '备件结算输出',
                         //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色）
-                        icon: '二配'
+                        icon: '供货'
                     }
                 }
             ]

vue/src/views/ux/billManage/FisUnSettledDiff/index.vue

@@ -512,7 +512,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 80,
+        width: 130,
       });
       tempsTabs.push({
         label: "当前版本",

vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@@ -63,7 +63,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔15秒进行自动刷新！</span
+          >说明：每间隔30秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -83,6 +83,7 @@
       border
       highlight-current-row
       style="width: 100%"
+      @sort-change="sortChange"
       @row-click="handleRowClick"
       @selection-change="handleSelectionChange"
       @filter-change="filterChange"
@@ -402,11 +403,34 @@
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
               <el-select
+                v-model="formCount.materialGroupValue"
+                size="medium"
+                multiple
+                filterable
+                clearable
+                style="width: 380px; margin-right: 15px"
+                @change="valueChange"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value"
+                >
+                  <span style="float: left">{{ item.label }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.value
+                  }}</span>
+                </el-option>
+              </el-select>
+              <!-- <el-select
                 v-model="formCount.materialGroupValue"
                 class="my-el-select"
                 style="width: 350px; margin-right: 15px"
                 size="medium"
                 multiple
+                clearable
                 placeholder="请选择"
               >
                 <el-option
@@ -420,7 +444,7 @@
                     item.value
                   }}</span>
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -534,28 +558,25 @@
               <el-col :md="4" :xs="24">
                 <el-form-item label="KEEN号" />
               </el-col>
-              <el-col :md="20" :xs="24" style="margin-left: -80px">
+              <el-col :md="10" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="kennCode">
                   <el-input
                     type="textarea"
                     v-model="formCount.kennCode"
-                    style="width: 450px"
+                    style="width: 170px"
                     :rows="4"
                     placeholder="多个KENN号，请以回车换行形式添加！"
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-
-            <el-row>
               <el-col :md="4" :xs="24">
                 <el-form-item label="底盘号" />
               </el-col>
-              <el-col :md="20" :xs="24" style="margin-left: -80px">
+              <el-col :md="10" :xs="24" style="margin-left: -95px">
                 <el-form-item prop="chassisNumber">
                   <el-input
                     v-model="formCount.chassisNumber"
-                    style="width: 450px"
+                    style="width: 170px"
                     type="textarea"
                     :rows="4"
                     placeholder="多个底盘号，请以回车换行形式添加！"
@@ -568,27 +589,25 @@
               <el-col :md="4" :xs="24">
                 <el-form-item label="客户零件号" />
               </el-col>
-              <el-col :md="20" :xs="24" style="margin-left: -80px">
+              <el-col :md="10" :xs="24" style="margin-left: -80px">
                 <el-form-item prop="materialCode">
                   <el-input
                     v-model="formCount.materialCode"
-                    style="width: 450px"
+                    style="width: 170px"
                     type="textarea"
                     :rows="4"
                     placeholder="多个客户零件号，请以回车换行形式添加！"
                   />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :md="4" :xs="24">
                 <el-form-item label="厂内零件号" />
               </el-col>
-              <el-col :md="20" :xs="24" style="margin-left: -80px">
+              <el-col :md="10" :xs="24" style="margin-left: -95px">
                 <el-form-item prop="sapCode">
                   <el-input
                     v-model="formCount.sapCode"
-                    style="width: 450px"
+                    style="width: 170px"
                     type="textarea"
                     :rows="4"
                     placeholder="多个厂内零件号，请以回车换行形式添加！"
@@ -843,7 +862,7 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 15); //15秒刷新一次页面
+    }, 1000 * 30); //30秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
@@ -897,7 +916,7 @@ export default {
         width: 220,
       });
       tempsTabs.push({
-        label: "状态",
+        label: "审批状态",
         prop: "fileName",
         width: 150,
       });
@@ -905,6 +924,33 @@ export default {
     },
   },
   methods: {
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      console.log(this.listQuery.Sorting);
+      this.handleFilter();
+    },
+        /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "taskId";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -988,14 +1034,15 @@ export default {
         type: "warning",
       })
         .then(() => {
-          alert(this.JobversionValue);
           this.$axios
             .posts(
               "/api/settleaccount/wmsjitoutput/WmsJitOutPut",
               this.listBillQuery
             )
             .then((response) => {
-               console.log("检查柱护板-hostCheckQuery"+JSON.stringify(response));
+              console.log(
+                "检查柱护板-hostCheckQuery" + JSON.stringify(response)
+              );
               const index = this.list.indexOf(row);
               this.$notify({
                 title: "成功",
@@ -1008,7 +1055,6 @@ export default {
             });
         })
         .catch(() => {
-
           this.$message({
             type: "info",
             message: "已取消操作",
@@ -1206,12 +1252,34 @@ export default {
         });
     },
     //获取物料组车型
+    // getMaterialGroup() {
+    //   this.$axios
+    //     .posts("/api/settleaccount/CodeSetting/list", {
+    //       project: "物料组",
+    //       maxResultCount: 1000,
+    //       skipCount: 0,
+    //     })
+    //     .then((response) => {
+    //       this.materialGroupList = [];
+    //       response.items.forEach((element) => {
+    //         let options = {};
+    //         options.value = element.description;
+    //         options.label = element.value;
+    //         this.materialGroupList.push(options);
+    //       });
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    //获取物料组车型
     getMaterialGroup() {
       this.$axios
         .posts("/api/settleaccount/CodeSetting/list", {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
+          sorting:"value ascending"
         })
         .then((response) => {
           this.materialGroupList = [];

vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@@ -626,7 +626,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",

vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@@ -730,7 +730,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",

vue/src/views/ux/billManage/SettleDoorPanel/index.vue

@@ -772,7 +772,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",

vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@@ -385,18 +385,21 @@
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
-                  <el-select
+              <el-select
                 v-model="formCount.materialGroupValue"
-                style="width: 350px;margin-right: 15px"
                 size="medium"
                 multiple
+                filterable
+                clearable
+                style="width: 380px; margin-right: 15px"
+                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option
                   v-for="item in materialGroupList"
-                  :key="item.label"
+                  :key="item.value"
                   :label="item.value"
-                  :value="item.label"
+                  :value="item.value"
                 >
                   <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -774,7 +777,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",
@@ -954,6 +957,7 @@ export default {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
+          sorting: "value ascending",
         })
         .then((response) => {
           this.materialGroupList = [];

vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@@ -386,18 +386,21 @@
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
-                 <el-select
+              <el-select
                 v-model="formCount.materialGroupValue"
-                style="width: 350px;margin-right: 15px"
                 size="medium"
                 multiple
+                filterable
+                clearable
+                style="width: 380px; margin-right: 15px"
+                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option
                   v-for="item in materialGroupList"
-                  :key="item.label"
+                  :key="item.value"
                   :label="item.value"
-                  :value="item.label"
+                  :value="item.value"
                 >
                   <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -731,7 +734,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",
@@ -906,6 +909,7 @@ export default {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
+          sorting: "value ascending",
         })
         .then((response) => {
           this.materialGroupList = [];

vue/src/views/ux/billManage/UnSettledDiff/index.vue

@@ -728,7 +728,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",

vue/src/views/ux/billManage/kanBanWithCode/index.vue

@@ -35,7 +35,7 @@
           @click="handleCreateBills()"
           >生成出库单(支持批量)</el-button
         >
-         <el-button
+        <el-button
           class="filter-item"
           type="success"
           icon="el-icon-check"
@@ -401,18 +401,21 @@
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
-                  <el-select
+              <el-select
                 v-model="formCount.materialGroupValue"
-                style="width: 350px;margin-right: 15px"
                 size="medium"
                 multiple
+                filterable
+                clearable
+                style="width: 380px; margin-right: 15px"
+                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option
                   v-for="item in materialGroupList"
-                  :key="item.label"
+                  :key="item.value"
                   :label="item.value"
-                  :value="item.label"
+                  :value="item.value"
                 >
                   <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -464,25 +467,23 @@
             <el-form-item>
               <el-input
                 type="textarea"
-                style="width: 450px"
+                style="width: 170px"
                 v-model="formCount.kanBan"
                 :rows="5"
                 placeholder="多个看板号，请以回车换行形式添加！"
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
             <el-form-item prop="materialCode">
               <el-input
                 type="textarea"
                 v-model="formCount.materialCode"
                 :rows="5"
-                style="width: 450px"
+                style="width: 170px"
                 placeholder="多个客户零件号，请以回车换行形式添加！"
               />
             </el-form-item>
@@ -754,18 +755,13 @@ export default {
         prop: "createdAt",
         width: 150,
       });
-      tempsTabs.push({
+       tempsTabs.push({
         label: "说明",
         prop: "remark",
         width: 220,
       });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
       tempsTabs.push({
-        label: "状态",
+        label: "审批状态",
         prop: "fileName",
         width: 150,
       });
@@ -825,7 +821,7 @@ export default {
           });
         });
     },
-    handleConfirm(row){
+    handleConfirm(row) {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -1014,6 +1010,7 @@ export default {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
+          sorting: "value ascending",
         })
         .then((response) => {
           this.materialGroupList = [];

vue/src/views/ux/billManage/sparePart/index.vue

@@ -35,7 +35,7 @@
           @click="handleCreateBills()"
           >生成出库单(支持批量)</el-button
         >
-         <el-button
+        <el-button
           class="filter-item"
           type="success"
           icon="el-icon-check"
@@ -401,18 +401,21 @@
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
             <el-form-item prop="materialGroupValue">
-                  <el-select
+              <el-select
                 v-model="formCount.materialGroupValue"
-                style="width: 350px;margin-right: 15px"
                 size="medium"
                 multiple
+                filterable
+                clearable
+                style="width: 380px; margin-right: 15px"
+                @change="valueChange"
                 placeholder="请选择"
               >
                 <el-option
                   v-for="item in materialGroupList"
-                  :key="item.label"
+                  :key="item.value"
                   :label="item.value"
-                  :value="item.label"
+                  :value="item.value"
                 >
                   <span style="float: left">{{ item.label }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -428,17 +431,30 @@
           <el-col :md="4" :xs="24">
             <el-form-item label="CP5时间：" />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
             <el-form-item>
               <el-date-picker
-                v-model="datetime5"
+                v-model="cp5startTime"
-                type="datetimerange"
+                :picker-options="pickerOptions2"
-                :picker-options="pickerOptionsCp5"
+                type="datetime"
-                range-separator="至"
+                size="small"
-                start-placeholder="开始日期"
+                @change="getdateValueCp5"
-                end-placeholder="结束日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="cp5endTime"
+                :picker-options="pickerOptions3"
+                type="datetime"
+                size="small"
+                @change="getdateValCp5"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
               >
               </el-date-picker>
             </el-form-item>
@@ -483,37 +499,60 @@
             <el-form-item label="KEEN号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="kennCode">
-              <el-input v-model="formCount.kennCode" />
+              <el-input
+                type="textarea"
+                v-model="formCount.kennCode"
+                style="width: 170px"
+                :rows="4"
+                placeholder="多个KENN号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
           <el-col :md="4" :xs="24">
             <el-form-item label="底盘号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="chassisNumber">
-              <el-input v-model="formCount.chassisNumber" />
+              <el-input
+                v-model="formCount.chassisNumber"
+                style="width: 170px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个底盘号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="客户零件号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item>
+            <el-form-item prop="materialCode">
-              <el-input v-model="formCount.materialCode" />
+              <el-input
+                v-model="formCount.materialCode"
+                style="width: 170px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个客户零件号，请以回车换行形式添加！"
+              />
             </el-form-item>
           </el-col>
-          <!-- <el-col :md="4" :xs="24">
+          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
+            <el-form-item label="厂内零件号" />
           </el-col>
           <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item>
+            <el-form-item prop="sapCode">
-              <el-input v-model="formCount.sapMaterialCode" />
+              <el-input
+                v-model="formCount.sapCode"
+                style="width: 170px"
+                type="textarea"
+                :rows="4"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -577,6 +616,25 @@ export default {
           return time.getTime() <= new Date(this.startTime).getTime();
         },
       },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+
+      pickerOptions2: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          return time.getTime() > new Date(this.cp5endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions3: {
+        disabledDate: (time) => {
+          return time.getTime() <= new Date(this.cp5startTime).getTime();
+        },
+      },
       startTime: "",
       endTime: "",
       pickerOptionsCp7: {
@@ -601,6 +659,7 @@ export default {
       radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
       materialGroupList: [],
+      getmaterialGroupValue: "",
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
@@ -630,16 +689,20 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
+        startTime: "",
-        // datetime5: [],
+        endTime: "",
-        // datetime7: [],
+        cp5startTime: "",
-        settledate: "",
+        cp5endTime: "",
-        materialCode: "",
+        // name: "未结算对比",
-        sapMaterialCode: "",
+        // settledate: "",
-        chassisNumber: "",
+        // materialCode: "",
-        kennCode: "",
+        // sapMaterialCode: "",
-        version: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        // version: "",
       },
+      cp5startTime: "",
+      cp5endTime: "",
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -724,7 +787,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 130,
       });
       tempsTabs.push({
         label: "模块名称",
@@ -746,13 +809,8 @@ export default {
         prop: "remark",
         width: 220,
       });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
       tempsTabs.push({
-        label: "状态",
+        label: "审批状态",
         prop: "fileName",
         width: 150,
       });
@@ -760,6 +818,15 @@ export default {
     },
   },
   methods: {
+    //cp5
+    getdateValueCp5(val) {
+      this.cp5startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateValCp5(val) {
+      this.cp5endTime = val;
+      this.getbalanceIndexData();
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -812,7 +879,7 @@ export default {
           });
         });
     },
-    handleConfirm(row){
+    handleConfirm(row) {
       if (this.multipleSelection.length == 0) {
         this.$message({
           message: "至少选择一行！",
@@ -994,20 +1061,20 @@ export default {
           this.listLoading = false;
         });
     },
-    //获取物料组车型
     getMaterialGroup() {
       this.$axios
         .posts("/api/settleaccount/CodeSetting/list", {
           project: "物料组",
           maxResultCount: 1000,
           skipCount: 0,
+          sorting: "value ascending",
         })
         .then((response) => {
           this.materialGroupList = [];
           response.items.forEach((element) => {
             let options = {};
             options.value = element.description;
-            options.label = element.description;
+            options.label = element.value;
             this.materialGroupList.push(options);
           });
         })
@@ -1021,7 +1088,8 @@ export default {
       this.datetime5 = [];
       this.startTime = "";
       this.endTime = "";
-      // this.datetime7 = [];
+      this.cp5startTime = "";
+      this.cp5endTime = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
@@ -1031,22 +1099,18 @@ export default {
           if (this.formCount.materialCode != "") {
             this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
-          // if (this.formCount.sapMaterialCode != "") {
+          if (this.formCount.sapCode != "") {
-          //   this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
+            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
-          // }
+          }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
           }
-          var getdate5 = JSON.stringify(this.datetime5);
+          this.listExportQuery.begin = this.cp5startTime
-          if (getdate5 != "[]") {
+            ? this.cp5startTime
-            alert(this.datetime5[0]);
+            : undefined;
-            this.listExportQuery.begin = this.datetime5
+          this.listExportQuery.end = this.cp5endTime
-              ? this.datetime5[0] || undefined
+            ? this.cp5endTime
-              : undefined;
+            : undefined;
-            this.listExportQuery.end = this.datetime5
-              ? this.datetime5[1] || undefined
-              : undefined;
-          }
           if (this.startTime != "") {
             this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
           }
@@ -1057,8 +1121,7 @@ export default {
             this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
           if (this.formCount.materialGroupValue != "") {
-            this.listExportQuery.materialGroup =
+            this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
-              this.formCount.materialGroupValue; //物料组车型
           }
           console.log(
             "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery)
@@ -1096,6 +1159,11 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      this.cp5startTime = "";
+      this.cp5endTime = "";
       this.dialogFormVisible = true;
     },
     filterHandler(value, row, column) {

vue/src/views/ux/billManage/vwOutOrder/detail.vue

@@ -10,6 +10,12 @@
         @click="handleDownload()"
         >导出全部
       </el-button> -->
+      <JobSelectVerson
+        :options="JobVersionList"
+        style="width: 150px; margin-left: -10px"
+        class="search-container"
+        @value-change="JobVersionValue"
+      ></JobSelectVerson>
       <el-button
         class="filter-item"
         type="success"
@@ -106,10 +112,11 @@ import Pagination from "@/components/Pagination"; // secondary package based on
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import { downloadFile } from "@/utils/crmindex.js";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, CRMTableHead },
+  components: { Pagination, CRMTableHead, CRMTableHead, JobSelectVerson },
   directives: { permission },
   props: {
     customerInfos: {
@@ -131,6 +138,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+        version: "",
       },
       form: {
         dicDetailID: "",
@@ -141,6 +149,13 @@ export default {
       totalCount: 0,
       listLoading: true,
       formLoading: false,
+      JobVersionList: [
+        { value: "0", label: "未处理" },
+        { value: "1", label: "申请出库" },
+        { value: "2", label: "确认出库" },
+        { value: "3", label: "不能出库" },
+        { value: "4", label: "取消出库" },
+      ],
       // 高级搜索
       filterObj: {
         type: Object,
@@ -163,15 +178,18 @@ export default {
       },
       listOutPutQuery: {
         version: "",
-        ids: "",
+        guids: "",
+        billNum: "",
       },
       page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 210,
+      tableHeight: document.documentElement.clientHeight - 230,
       isEdit: false,
     };
   },
@@ -193,6 +211,7 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+            this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -209,21 +228,38 @@ export default {
       tempsTabs.push({
         label: "版本",
         prop: "version",
-        width: 150,
+        width: 110,
       });
       tempsTabs.push({
         label: "零件号",
         prop: "materialCode",
         width: 150,
       });
+      tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 });
+      tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 });
       tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 });
       tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 });
-      tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 });
+      tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
       tempsTabs.push({ label: "状态", prop: "state", width: 100 });
       return tempsTabs;
     },
   },
   methods: {
+    //版本下拉列表选择项
+    JobVersionValue(params) {
+      //版本下拉选择
+      this.listQuery.Filters = [];
+      var column = "state";
+      let filter = {
+        logic: 0,
+        column: column,
+        action: 0,
+        value: params.value,
+      };
+      this.listQuery.Filters.push(filter);
+      this.getList();
+    },
     //取消出库单
     handleCancelBills(row) {
       if (this.multipleSelection.length == 0) {
@@ -233,8 +269,7 @@ export default {
         });
         return;
       }
-      //var params = [];
+      var params = [];
-      var params = "";
       let myalert = ""; //声明变量，其变量必须在此声明后使用
       if (row) {
         //单行
@@ -244,13 +279,14 @@ export default {
         //多选
         this.multipleSelection.forEach((element) => {
           let id = element.id;
-          //params.push(id);
+          params.push(id);
-          params += id + ",";
         });
         myalert = "选中项";
       }
-      this.listOutPutQuery.version = row.version;
+      this.listOutPutQuery.version = this.customerInfo.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
+      this.listOutPutQuery.guids = params;
+      this.listOutPutQuery.billNum = this.customerInfo.parentId;
+      console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery));
 
       this.$confirm("是否确认取消出库" + myalert + "?", "提示", {
         confirmButtonText: "确定",
@@ -284,59 +320,96 @@ export default {
     //出库单
     handleCreateBills(row) {
       if (this.multipleSelection.length == 0) {
-        this.$message({
+        this.listLoading = true;
-          message: "至少选择一行！",
+        this.listOutPutQuery.guids = [];
+        this.listOutPutQuery.version = this.customerInfo.version;
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
+        console.log(
+          "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否全部确认出库?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
           type: "warning",
-        });
+        })
-        return;
+          .then(() => {
-      }
+            this.$axios
-      //var params = [];
+              .posts(
-      var params = "";
+                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
+                this.listOutPutQuery
-      if (row) {
+              )
-        //单行
+              .then((response) => {
-        params.push(row.id);
+                const index = this.list.indexOf(row);
-        myalert = row.name;
+                this.$notify({
-      } else {
+                  title: "成功",
-        //多选
+                  message: "生成成功",
-        this.multipleSelection.forEach((element) => {
+                  type: "success",
-          let id = element.id;
+                  duration: 2000,
-          //params.push(id);
+                });
-          params += id + ",";
+                this.getList();
-        });
+                this.listLoading = false;
-        myalert = "选中项";
-      }
-      this.listOutPutQuery.version = row.version;
-      this.listOutPutQuery.ids = params.substr(0, params.length - 1);
-
-      this.$confirm("是否确认出库" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts(
-              "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
-              this.listOutPutQuery
-            )
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "生成成功",
-                type: "success",
-                duration: 2000,
               });
-              this.getList();
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
             });
+            this.listLoading = false;
+          });
+      } else {
+        this.listLoading = true;
+        var params = [];
+        let myalert = ""; //声明变量，其变量必须在此声明后使用
+        if (row) {
+          //单行
+          params.push(row.id);
+          myalert = row.name;
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.push(id);
+          });
+          myalert = "选中项";
+        }
+        this.listOutPutQuery.version = this.customerInfo.version;
+        this.listOutPutQuery.guids = params;
+        this.listOutPutQuery.billNum = this.customerInfo.parentId;
+        console.log(
+          "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery)
+        );
+        this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
         })
-        .catch(() => {
+          .then(() => {
-          this.$message({
+            this.$axios
-            type: "info",
+              .posts(
-            message: "已取消操作",
+                "/api/settleaccount/wmsjitoutput/WmsJitOutPut-Pass",
+                this.listOutPutQuery
+              )
+              .then((response) => {
+                const index = this.list.indexOf(row);
+                this.$notify({
+                  title: "成功",
+                  message: "生成成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+                this.listLoading = false;
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消操作",
+            });
+            this.listLoading = false;
           });
-        });
+      }
     },
     /** 刷新列表 */
     handleHandle(data) {
@@ -346,6 +419,15 @@ export default {
     },
     /** 格式化字段 */
     fieldFormatter(row, column) {
+      if (column.property == "state") {
+        return {
+          0: "未处理",
+          1: "申请出库",
+          2: "确认出库",
+          3: "不能出库",
+          4: "取消出库",
+        }[row[column.property]];
+      }
       return row[column.property] || "--";
     },
     importExcelData() {

vue/src/views/ux/billManage/vwOutOrder/index.vue

@@ -105,9 +105,10 @@ import Detail from "./detail";
 import moment from "moment";
 import { formatTimeToTimestamp } from "@/utils/index";
 
+
 export default {
   name: "sendUnsettledDiffReport",
-  components: { Pagination, Detail },
+  components: { Pagination, Detail},
   directives: { permission },
   data() {
     return {
@@ -216,9 +217,11 @@ export default {
     handleDrawerOpen(param) {
       this.drawer = true;
       var parentId = param.billNum; //单据号
+      var version = param.version; //版本
       this.customerInfos = [
         {
           ParentId: parentId,
+          Version: version,
         },
       ];
     },

vue/static/tableFieldForSearch.json

@@ -2926,6 +2926,24 @@
         "fieldType": 1,
         "fieldName": "materialGroup",
         "setting": []
+      },
+      {
+        "fieldId": 2,
+        "formType": "select",
+        "isNull": 0,
+        "name": "状态",
+        "options": "",
+        "type": 3,
+        "value": "",
+        "fieldType": 0,
+        "fieldName": "state",
+        "setting": [
+          "未处理,0",
+          "申请出库,1",
+          "确认出库,2",
+          "不能出库,3",
+          "取消出库,4"
+        ]
       }
     ]
   }