已结出库单查询及出库差异清单界面

vue/src/router/modules/wms_out_order.js

@@ -13,7 +13,7 @@ const vwsOutOrderDataRouter = {
     index: 0,
     type: 'crm',
     icon: '单据导入',
-    roles: ['SettleAccount.Reports'],
+    roles: ['SettleAccount.WMSJIT'],
     keepAlive: false,
   },
   children: [
@@ -43,7 +43,7 @@ const vwsOutOrderDataRouter = {
       name: 'WMSOutputSumReport',//命名路由
       meta: {
         title: '结算出库SAP接口',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
+        roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） 
         icon: '零件'
       }
     },
@@ -53,8 +53,8 @@ const vwsOutOrderDataRouter = {
       component: () => import('@/views/ux/billManage/WMSOutputDetailDiffReport'),
       name: 'WMSOutputDetailDiffReport',//命名路由
       meta: {
-        title: '全部出库差异',
+        title: '出库差异清单',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
+        roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） 
         icon: '零件'
       }
     },
@@ -64,8 +64,8 @@ const vwsOutOrderDataRouter = {
       component: () => import('@/views/ux/billManage/WMSOutputDetailWithCodeReport'),
       name: 'WMSOutputDetailWithCodeReport',//命名路由
       meta: {
-        title: '出库差异(有单号)',
+        title: '已结算出库查询',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） 
+        roles: ['SettleAccount.WMSJIT'],//控制页面角色（可以设置多个角色） 
         icon: '零件'
       }
     },

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

@@ -8,21 +8,14 @@
         class="search-container"
         @value-change="JobVersionValue"
       ></JobSelectVerson>
-      <!-- <el-button
+
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button> -->
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-plus"
         @click="handleCreate"
-        >生成出库数据
+        >生成数据
       </el-button>
       <el-button
         class="filter-item"
@@ -34,15 +27,44 @@
       </el-button>
 
       <el-select
-        v-model="listQuery.state"
+        v-model="selectClient"
-        @change="selectState"
+        clearable
-        placeholder="请选择过滤状态"
+        @change="SelectClient"
+        placeholder="客户"
+        style="width: 100px; margin-left: 8px"
+      >
+        <el-option label="大众" value="大众"></el-option>
+        <el-option label="红旗" value="红旗"></el-option>
+        <!-- <el-option label="红旗" value="红旗"></el-option> -->
+      </el-select>
+
+      <el-select
+        v-model="selectType"
+        clearable
+        @change="SelectType"
+        placeholder="请选择"
         style="width: 200px; margin-left: 8px"
       >
-        <el-option label="新建" :value="0"></el-option>
+        <el-option label="大众准时化出库" value="大众准时化出库"></el-option>
-        <el-option label="已申请" :value="1"></el-option>
+        <el-option label="大众看板出库" value="大众看板出库"></el-option>
-        <el-option label="成功" :value="2"></el-option>
+        <el-option
-        <el-option label="失败" :value="3"></el-option>
+          label="大众备件条码出库"
+          value="大众备件条码出库"
+        ></el-option>
+        <el-option label="红旗看板出库" value="红旗看板出库"></el-option>
+        <el-option label="大众无看板出库" value="大众无看板出库"></el-option>
+        <el-option
+          label="大众备件汇总出库"
+          value="大众备件汇总出库"
+        ></el-option>
+        <el-option
+          label="红旗一轿手工出库"
+          value="红旗一轿手工出库"
+        ></el-option>
+        <el-option
+          label="红旗一轿手工出库(备件)"
+          value="红旗一轿手工出库(备件)"
+        ></el-option>
       </el-select>
 
       <el-input
@@ -98,7 +120,7 @@
       @selection-change="handleSelectionChange"
       @row-click="handleRowClick"
     >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column type="selection" width="44px"></el-table-column>
       <el-table-column
         label="版本"
         prop="version"
@@ -185,22 +207,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
+
-          <el-col :md="4" :xs="24">
-            <el-form-item label="过账日期" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="dataValue">
-              <el-date-picker
-                v-model="dataValue"
-                style="width: 188px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="dialogFormVisible = false"
@@ -212,48 +219,6 @@
         >
       </div>
     </el-dialog>
-
-    <el-dialog
-      :visible.sync="dialogAccounDateVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="过账日期" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="dataValue">
-              <el-date-picker
-                v-model="dataValue"
-                style="width: 188px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogAccounDateVisible = false"
-          >取消</el-button
-        >
-        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
-        <el-button v-loading="formLoading" type="primary" @click="saveDate"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -295,6 +260,7 @@ export default {
       versionValue: "",
       dataValue: "",
       versionList: [], //版本列表
+      selectClient: "",
       JobVersionList: [],
       rules: {
         //前端定义的规则，后端也有验证
@@ -392,50 +358,31 @@ export default {
   },
   computed: {
     /** 列表字段 */
+
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "状态", prop: "state", width: 180 });
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "版本号", prop: "version", width: 150 });
       tempsTabs.push({
         label: "客户",
         prop: "client",
-        width: 120,
+        width: 110,
       });
       tempsTabs.push({
         label: "出库类型",
         prop: "type",
         width: 150,
       });
-      tempsTabs.push({
+      tempsTabs.push({ label: "结算单", prop: "billNum", width: 180 });
-        label: "结算编码",
+      tempsTabs.push({ label: "交货编码", prop: "switchCode", width: 180 });
-        prop: "settleCode",
+
-        width: 150,
+      tempsTabs.push({ label: "结算数量", prop: "qty", width: 120 });
-      });
+      tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 150 });
-      tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 });
-      tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 });
-      tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 });
-      tempsTabs.push({
-        label: "物料号",
-        prop: "materialCode",
-        width: 150,
-      });
-      tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 });
-      tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 });
       tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
 
       tempsTabs.push({
-        label: "开票单价",
+        label: "物料号",
-        prop: "price",
+        prop: "materialCode",
-        width: 150,
+        width: 140,
-      });
-      tempsTabs.push({
-        label: "结算金额",
-        prop: "amt",
-        width: 120,
       });
-      tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 });
-      tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 });
       tempsTabs.push({
         label: "物料组编码",
         prop: "materialGroupCode",
@@ -444,13 +391,75 @@ export default {
       tempsTabs.push({
         label: "物料组(车型)",
         prop: "materialGroup",
-        width: 320,
+        width: 200,
       });
-      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 });
+      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 380 });
       tempsTabs.push({ label: "备注", prop: "remark1", width: 220 });
 
       return tempsTabs;
     },
+
+    // getDefaultField() {
+    //   var tempsTabs = [];
+    //   // tempsTabs.push({ label: "状态", prop: "state", width: 180 });
+    //   tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
+    //   // tempsTabs.push({ label: "版本号", prop: "version", width: 150 });
+    //   tempsTabs.push({
+    //     label: "客户",
+    //     prop: "client",
+    //     width: 120,
+    //   });
+    //   tempsTabs.push({
+    //     label: "出库类型",
+    //     prop: "type",
+    //     width: 150,
+    //   });
+    //   tempsTabs.push({
+    //     label: "结算编码",
+    //     prop: "settleCode",
+    //     width: 150,
+    //   });
+    //   tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 });
+    //   tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 });
+    //    tempsTabs.push({ label: "交货编码", prop: "switchCode", width: 150 });
+    //   tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 });
+
+    //   tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 });
+    //   tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 });
+    //   tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
+
+    //   tempsTabs.push({
+    //     label: "开票单价",
+    //     prop: "price",
+    //     width: 150,
+    //   });
+    //   tempsTabs.push({
+    //     label: "结算金额",
+    //     prop: "amt",
+    //     width: 120,
+    //   });
+    //   tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 });
+    //   tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 });
+    //   tempsTabs.push({
+    //     label: "物料号",
+    //     prop: "materialCode",
+    //     width: 150,
+    //   });
+    //   tempsTabs.push({
+    //     label: "物料组编码",
+    //     prop: "materialGroupCode",
+    //     width: 150,
+    //   });
+    //   tempsTabs.push({
+    //     label: "物料组(车型)",
+    //     prop: "materialGroup",
+    //     width: 320,
+    //   });
+    //   tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 });
+    //   tempsTabs.push({ label: "备注", prop: "remark1", width: 220 });
+
+    //   return tempsTabs;
+    // },
   },
   methods: {
     //版本下拉列表选择项
@@ -459,9 +468,12 @@ export default {
       this.JobversionValue = params.value;
       this.getList();
     },
-    selectState(params) {
+    SelectType(params) {
-      //版本下拉选择
+      this.listQuery.type = params;
-      this.listQuery.state = params;
+      this.getList();
+    },
+    SelectClient(params) {
+      this.listQuery.client = params;
       this.getList();
     },
     //从期间管理中获取版本数据，生成结算出库用
@@ -573,46 +585,7 @@ export default {
         }
       });
     },
-    //同步到SAP
+
-    saveDate() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          if (this.dataValue === "") {
-            this.$message.error("必需选择过账日期！");
-            this.formLoading = false;
-            return;
-          }
-          console.log("日期传值：" + this.dataValue);
-          this.$axios
-            .posts("/api/settleaccount/WMSOutputDetailDiffReport/Sync", {
-              accountDate: this.dataValue,
-            })
-            .then((res) => {
-              if (res == true) {
-                this.$notify({
-                  title: "成功",
-                  message: "数据同步成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.formLoading = false;
-                this.dialogAccounDateVisible = false;
-              } else {
-                this.$message({
-                  message: "数据同步失败！",
-                  type: "warning",
-                });
-              }
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogAccounDateVisible = false;
-            });
-        }
-      });
-    },
     //导出功能
     async handleDownload() {
       this.listLoading = true;
@@ -626,7 +599,10 @@ export default {
       // }
       console.log("结算出库单个导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSOutputDetailDiffReport/Export", this.listQuery)
+        .posts(
+          "/api/settleaccount/WMSOutputDetailDiffReport/Export",
+          this.listQuery
+        )
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -708,7 +684,7 @@ export default {
     getList(data) {
       this.listLoading = true;
       //this.listQuery.SkipCount = (this.page - 1) * 10;
-       if (data != undefined) {
+      if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
@@ -719,7 +695,7 @@ export default {
       console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
-          "/api/settleaccount/WMSOutputDetailDiffReport​/WmsDetailReport",
+          "/api/settleaccount/WMSOutputDetailDiffReport/WmsDetailReport",
           this.listQuery
         )
         .then((response) => {

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

@@ -8,21 +8,13 @@
         class="search-container"
         @value-change="JobVersionValue"
       ></JobSelectVerson>
-      <!-- <el-button
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportExcel()"
-        >导入文件（Excel）
-      </el-button> -->
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-plus"
         @click="handleCreate"
-        >生成出库数据
+        >生成数据
       </el-button>
       <el-button
         class="filter-item"
@@ -34,23 +26,38 @@
       </el-button>
 
       <el-select
-        v-model="listQuery.state"
+        v-model="selectClient"
-        @change="selectState"
+        clearable
-        placeholder="请选择过滤状态"
+        @change="SelectClient"
+        placeholder="客户"
+        style="width: 100px; margin-left: 8px"
+      >
+        <el-option label="大众" value="大众"></el-option>
+        <el-option label="红旗" value="红旗"></el-option>
+      </el-select>
+
+      <el-select
+        v-model="selectType"
+        clearable
+        @change="SelectType"
+        placeholder="请选择"
         style="width: 200px; margin-left: 8px"
       >
-        <el-option label="新建" :value="0"></el-option>
+        <el-option label="大众准时化出库" value="大众准时化出库"></el-option>
-        <el-option label="已申请" :value="1"></el-option>
+        <el-option label="大众看板出库" value="大众看板出库"></el-option>
-        <el-option label="成功" :value="2"></el-option>
+        <el-option
-        <el-option label="失败" :value="3"></el-option>
+          label="大众备件条码出库"
+          value="大众备件条码出库"
+        ></el-option>
+        <el-option label="红旗看板出库" value="红旗看板出库"></el-option>
       </el-select>
 
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照结算单号搜索..."
+        placeholder="根据结算单号搜索..."
-        style="width: 200px"
+        style="width: 220px"
         class="search-container"
         @keyup.enter.native="handleFilter"
       />
@@ -61,14 +68,7 @@
         @click="handleFilter"
         >搜索
       </el-button>
-      <!-- <el-button
+
-        class="filter-item"
-        size="mini"
-        type="warning"
-        icon="el-icon-upload2"
-        @click="handleImportSap()"
-        >同步到SAP
-      </el-button> -->
       <!--表格头组件，filter查询-->
       <c-r-m-table-head
         ref="crmTableHead"
@@ -185,22 +185,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="过账日期" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="dataValue">
-              <el-date-picker
-                v-model="dataValue"
-                style="width: 188px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="text" @click="dialogFormVisible = false"
@@ -213,47 +197,6 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      :visible.sync="dialogAccounDateVisible"
-      :close-on-click-modal="false"
-      :title="formTitle"
-      append-to-body
-      width="680px"
-    >
-      <el-form
-        ref="formCount"
-        :inline="true"
-        :rules="rules"
-        :model="formCount"
-        size="mini"
-      >
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="过账日期" required />
-          </el-col>
-          <el-col :md="20" :xs="24">
-            <el-form-item prop="dataValue">
-              <el-date-picker
-                v-model="dataValue"
-                style="width: 188px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogAccounDateVisible = false"
-          >取消</el-button
-        >
-        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
-        <el-button v-loading="formLoading" type="primary" @click="saveDate"
-          >确认</el-button
-        >
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -295,6 +238,7 @@ export default {
       versionValue: "",
       dataValue: "",
       versionList: [], //版本列表
+      selectType: "", //出库类型
       JobVersionList: [],
       rules: {
         //前端定义的规则，后端也有验证
@@ -346,7 +290,10 @@ export default {
         MaxResultCount: 15,
         version: "",
         state: undefined,
+        client: undefined,
+        type: undefined,
       },
+      selectClient: "",
       listExportQuery: {
         Filters: [
           {
@@ -369,7 +316,6 @@ export default {
       dialogAccounDateVisible: false,
       multipleSelection: [],
       formTitle: "",
-      drawer: false,
       showExcelImport: false,
       tableHeight: document.documentElement.clientHeight - 220,
       isEdit: false,
@@ -394,76 +340,80 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "状态", prop: "state", width: 180 });
+
       tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "版本号", prop: "version", width: 150 });
       tempsTabs.push({
         label: "客户",
         prop: "client",
-        width: 120,
+        width: 100,
       });
       tempsTabs.push({
         label: "出库类型",
         prop: "type",
         width: 150,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "结算编码",
+      //   label: "结算编码",
-        prop: "settleCode",
+      //   prop: "settleCode",
-        width: 150,
+      //   width: 150,
-      });
+      // });
-      tempsTabs.push({ label: "销售渠道", prop: "saleCode", width: 120 });
+
-      tempsTabs.push({ label: "客户代码", prop: "clientCode", width: 120 });
+      tempsTabs.push({ label: "交货编码", prop: "switchCode", width: 180 });
-      tempsTabs.push({ label: "结算单", prop: "billNum", width: 150 });
+      tempsTabs.push({ label: "结算单", prop: "billNum", width: 180 });
-      tempsTabs.push({
+
-        label: "物料号",
+      tempsTabs.push({ label: "结算数量", prop: "qty", width: 120 });
-        prop: "materialCode",
+      //tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 });
-        width: 150,
+      //tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
-      });
-      tempsTabs.push({ label: "结算数量", prop: "qty", width: 150 });
-      tempsTabs.push({ label: "实际出库数量", prop: "outputQty", width: 180 });
-      tempsTabs.push({ label: "差异数量", prop: "diffQty", width: 120 });
 
       tempsTabs.push({
         label: "开票单价",
         prop: "price",
-        width: 150,
+        width: 120,
       });
       tempsTabs.push({
         label: "结算金额",
         prop: "amt",
         width: 120,
       });
-      tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 });
+      //tempsTabs.push({ label: "已出库金额", prop: "outPutAmt", width: 150 });
-      tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 });
+      //tempsTabs.push({ label: "WMS待出库金额", prop: "diffAmt", width: 180 });
       tempsTabs.push({
-        label: "物料组编码",
+        label: "SAP物料号",
-        prop: "materialGroupCode",
+        prop: "materialCode",
-        width: 150,
+        width: 140,
       });
       tempsTabs.push({
         label: "物料组(车型)",
         prop: "materialGroup",
-        width: 320,
+        width: 200,
+      });
+      tempsTabs.push({
+        label: "物料组编码",
+        prop: "estimateType",
+        width: 150,
       });
-      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 420 });
+      tempsTabs.push({ label: "物料组描述", prop: "materialDesc", width: 380 });
+
       tempsTabs.push({ label: "备注", prop: "remark1", width: 220 });
 
       return tempsTabs;
     },
   },
   methods: {
+    SelectType(params) {
+      this.listQuery.type = params;
+      this.getList();
+    },
+    SelectClient(params) {
+      this.listQuery.client = params;
+      this.getList();
+    },
     //版本下拉列表选择项
     JobVersionValue(params) {
       //版本下拉选择
       this.JobversionValue = params.value;
       this.getList();
     },
-    selectState(params) {
-      //版本下拉选择
-      this.listQuery.state = params;
-      this.getList();
-    },
     //从期间管理中获取版本数据，生成结算出库用
     getAllVersionList() {
       this.$axios
@@ -573,46 +523,7 @@ export default {
         }
       });
     },
-    //同步到SAP
+
-    saveDate() {
-      this.$refs.formCount.validate((valid) => {
-        if (valid) {
-          this.formLoading = true;
-          if (this.dataValue === "") {
-            this.$message.error("必需选择过账日期！");
-            this.formLoading = false;
-            return;
-          }
-          console.log("日期传值：" + this.dataValue);
-          this.$axios
-            .posts("/api/settleaccount/WMSOutputDetailWithCodeReport/Sync", {
-              accountDate: this.dataValue,
-            })
-            .then((res) => {
-              if (res == true) {
-                this.$notify({
-                  title: "成功",
-                  message: "数据同步成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.getList();
-                this.formLoading = false;
-                this.dialogAccounDateVisible = false;
-              } else {
-                this.$message({
-                  message: "数据同步失败！",
-                  type: "warning",
-                });
-              }
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogAccounDateVisible = false;
-            });
-        }
-      });
-    },
     //导出功能
     async handleDownload() {
       this.listLoading = true;
@@ -626,7 +537,10 @@ export default {
       // }
       console.log("结算出库单个导出：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/settleaccount/WMSOutputDetailWithCodeReport/Export", this.listQuery)
+        .posts(
+          "/api/settleaccount/WMSOutputDetailWithCodeReport/Export",
+          this.listQuery
+        )
         .then((res) => {
           let fileNameOfProject = res;
           this.$axios
@@ -707,8 +621,7 @@ export default {
 
     getList(data) {
       this.listLoading = true;
-      //this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
-       if (data != undefined) {
         this.listQuery.SkipCount = (this.page - 1) * data.limit;
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;

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

@@ -65,13 +65,13 @@
         >全部导出
       </el-button>
       <!--表格头组件，filter查询-->
-      <c-r-m-table-head
+      <!-- <c-r-m-table-head
         ref="crmTableHead"
         :crm-type="crmType"
         @handle="handleHandle"
         @filter="handleFilters"
       >
-      </c-r-m-table-head>
+      </c-r-m-table-head> -->
     </flexbox>
     <!--表格渲染-->
     <el-table

vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue

@@ -57,13 +57,13 @@
         >全部导出
       </el-button>
       <!--表格头组件，filter查询-->
-      <c-r-m-table-head
+      <!-- <c-r-m-table-head
         ref="crmTableHead"
         :crm-type="crmType"
         @handle="handleHandle"
         @filter="handleFilters"
       >
-      </c-r-m-table-head>
+      </c-r-m-table-head> -->
     </flexbox>
     <!--表格渲染-->
     <el-table

vue/static/tableFieldForSearch.json

@@ -3199,24 +3199,76 @@
         "fieldType": 1,
         "fieldName": "materialGroup",
         "setting": []
+      }
+    ]
+  },
+  "wmsOutputDetailWithCodeReport": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "交货编码",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "switchCode",
+        "setting": []
       },
       {
-        "fieldId": 2,
+        "fieldId": 5,
-        "formType": "select",
+        "formType": "text",
-        "isNull": 0,
+        "name": "SAP物料号",
-        "name": "状态",
+        "type": 1,
-        "options": "",
-        "type": 3,
         "value": "",
-        "fieldType": 0,
+        "fieldType": 1,
-        "fieldName": "state",
+        "fieldName": "materialGroup",
-        "setting": [
+        "setting": []
-          "未处理,0",
+      },
-          "申请出库,1",
+      {
-          "确认出库,2",
+        "fieldId": 5,
-          "不能出库,3",
+        "formType": "text",
-          "取消出库,4"
+        "name": "物料组编码",
-        ]
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "estimateType",
+        "setting": []
+      }
+    ]
+  },
+  "wmsOutputDetailDiffReport": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "交货编码",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "switchCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "物料号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "物料组编码",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialGroupCode",
+        "setting": []
       }
     ]
   },