日常提交

src/AuthServer/AuthServer.Host/appsettings.json

@@ -1,7 +1,8 @@
 {
   "ConnectionStrings": {
     //    "Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;",
-    "Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+    //"Default": "Server=192.168.0.203;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+    "Default": "Server=182.61.150.130;Database=ABP;User ID=sa;Password=Microsoft@2008;"
   },
   "ElasticSearch": {
     "Url": "http://localhost:9200"

src/Modules/BaseService/BaseService.Host/BaseServiceHostModule.cs

@@ -200,6 +200,7 @@ namespace BaseService
                     options.Authority = configuration["AuthServer:Authority"];
                     options.RequireHttpsMetadata = false;
                     options.Audience = "BaseService";
+                   // options.TokenValidationParameters.ValidateIssuer = Convert.ToBoolean(configuration["AuthServer:ValidateIssuer"]);
                 });
         }
 

vue/src/components/ImportExcel-base/index.vue

@@ -283,21 +283,7 @@ export default {
     showCancel() {
       return this.stepsActive == 1;
     },
-    getMoudleDisable() {
+
-      if (
-        this.crmType == "priceList" ||
-        this.crmType == "spareparts" ||
-        this.crmType == "wmsOutputSum"
-      ) {
-        //只状态可用
-        this.isEditYearMont = true;
-        this.isEditFactory = true;
-        this.isState = false;
-      } else {
-        this.isEditYearMont = false;
-        this.isEditFactory = false;
-      }
-    },
     crmTypeName() {
       return (
         {
@@ -487,6 +473,21 @@ export default {
   },
   mounted() {},
   methods: {
+    getMoudleDisable() {
+      if (
+        this.crmType == "priceList" ||
+        this.crmType == "spareparts" ||
+        this.crmType == "wmsOutputSum"
+      ) {
+        //只状态可用
+        this.isEditYearMont = true;
+        this.isEditFactory = true;
+        this.isState = false;
+      } else {
+        this.isEditYearMont = false;
+        this.isEditFactory = false;
+      }
+    },
     getAllYearMonth() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")

vue/src/router/modules/custom_menu.js

@@ -2,7 +2,7 @@
 import Layout from '@/layout'
 
 const customerOutOrderDataRouter = {
-  path: '/cpat-order',
+  path: '/cpat-customer',
   component: Layout,
   redirect: 'pg',
   name: '业务数据',

vue/src/router/modules/hq_out_order.js

@@ -27,26 +27,26 @@ const hqOutOrderDataRouter = {
         icon: '工厂'
       }
     },
-    {
+    // {
-      path: 'hq-h-checkout',
+    //   path: 'hq-h-checkout',
-      component: () => import('@/views/ux/vw/dataInput/hq_h_checkout'),
+    //   component: () => import('@/views/ux/vw/dataInput/hq_h_checkout'),
-      name: 'SettleAccount',//命名路由
+    //   name: 'SettleAccount',//命名路由
-      meta: {
+    //   meta: {
-        title: '红旗备件出库单',
+    //     title: '红旗备件出库单',
-        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    //     roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-        icon: '结算'
+    //     icon: '结算'
-      }
+    //   }
-    },
+    // },
-    {
+    // {
-      path: 'hq-y-outorder',
+    //   path: 'hq-y-outorder',
-      component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
+    //   component: () => import('@/views/ux/vw/dataInput/hq_y_outorder'),
-      name: 'SettleAccount',//命名路由
+    //   name: 'SettleAccount',//命名路由
-      meta: {
+    //   meta: {
-        title: '一汽轿车出库单',
+    //     title: '一汽轿车出库单',
-        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    //     roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-        icon: '售后'
+    //     icon: '售后'
-      }
+    //   }
-    },
+    // },
     {
       path: 'hq-kb-outorder',
       component: () => import('@/views/ux/vw/dataInput/hq_kb_output'),

vue/src/router/modules/onetimesale.js

@@ -2,7 +2,7 @@
 import Layout from '@/layout'
 
 const onetimesaleDataRouter = {
-  path: '/cpat-order-onetimesale',
+  path: '/cpat-onetimesale',
   component: Layout,
   redirect: 'pg',
   name: '业务数据',

vue/src/router/modules/vw_menu.js

@@ -74,16 +74,16 @@ const vwMenudataRouter = {
                         icon: '工厂'
                     }
                 },
-                {
+                // {
-                    path: 'spare-part-90',
+                //     path: 'spare-part-90',
-                    component: () => import('@/views/ux/vw/dataInput/SparePart90'),
+                //     component: () => import('@/views/ux/vw/dataInput/SparePart90'),
-                    name: 'SparePart90',//命名路由
+                //     name: 'SparePart90',//命名路由
-                    meta: {
+                //     meta: {
-                        title: '大众备件结算调整',
+                //         title: '大众备件结算调整',
-                        roles: ['SettleAccount.SparePart'],//控制页面角色（可以设置多个角色）
+                //         roles: ['SettleAccount.SparePart'],//控制页面角色（可以设置多个角色）
-                        icon: '工厂'
+                //         icon: '工厂'
-                    }
+                //     }
-                },
+                // },
                 {
                     path: 'scrap-claims',
                     component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),

vue/src/views/ux/backGroundWork/index.vue

@@ -20,6 +20,19 @@
           @click="searchALl()"
           >查询全部任务信息
         </el-button>
+
+        <el-button
+          class="filter-item"
+          plain
+          size="mini"
+          type="warning"
+          icon="el-icon-bottom"
+          @click="downloadTemplate()"
+          >点击下载系统导入模板
+        </el-button>
+        <span style="margin-left: 10px; color: #ff5640"
+          >说明：上传模板时，模板名后请加上当前日期，例如：红旗一轿手工出库单20220617！</span
+        >
         <!-- <el-tooltip class="item" effect="dark" content="手动刷新" placement="top">
         <el-button
           size="mini"
@@ -609,6 +622,22 @@ export default {
     },
   },
   methods: {
+    // 下载模板操作
+    downloadTemplate() {
+      let downfilename = "系统导入模板.rar";
+      this.$axios
+        .BolbGets("/api/settleaccount/getblobfile/download/" + downfilename)
+        .then((response) => {
+          downloadFile(response, downfilename);
+          this.$notify({
+            title: "成功",
+            message: "模板下载成功！",
+            type: "success",
+            duration: 2000,
+          });
+        })
+        .catch(() => {});
+    },
     resetForm(formName) {
       this.formCount = {};
     },

vue/src/views/ux/basedata/priceList/index.vue

@@ -261,11 +261,11 @@ export default {
         prop: "materialCode",
         width: 230,
       });
-      // tempsTabs.push({
+      tempsTabs.push({
-      //   label: "价格类型",
+        label: "客户编号",
-      //   prop: "type",
+        prop: "customerCode",
-      //   width: 100,
+        width: 100,
-      // });
+      });
       tempsTabs.push({
         label: "价格",
         prop: "price",

vue/src/views/ux/basedata/spareparts/index.vue

@@ -273,11 +273,11 @@ export default {
         prop: "materialCode",
         width: 180,
       });
-      // tempsTabs.push({
+      tempsTabs.push({
-      //   label: "价格类型",
+        label: "客户编号",
-      //   prop: "type",
+        prop: "customerCode",
-      //   width: 100,
+        width: 100,
-      // });
+      });
       tempsTabs.push({
         label: "价格",
         prop: "price",

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

@@ -425,7 +425,7 @@
                     type="textarea"
                     v-model="formCount.kennCode"
                     style="width: 170px"
-                    :rows="4"
+                    :rows="3"
                     placeholder="多个KENN号，请以回车换行形式添加！"
                   />
                 </el-form-item>

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

@@ -435,7 +435,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="日期查询：" />
           </el-col>
@@ -467,7 +467,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="看板号" />
@@ -679,7 +679,7 @@ export default {
       page: 1,
       dialogFormVisible: false,
       multipleSelection: [],
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 210,
       isEdit: false,
       menuCateMap: [
         { label: "导出", value: "导出", cssName: "warning" },
@@ -1202,10 +1202,10 @@ export default {
           if (this.formCount.materialGroupValue != "") {
             this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
           }
-          this.listExportQuery.begin = this.startTime
+          // this.listExportQuery.begin = this.startTime
-            ? this.startTime
+          //   ? this.startTime
-            : undefined;
+          //   : undefined;
-          this.listExportQuery.end = this.endTime ? this.endTime : undefined;
+          // this.listExportQuery.end = this.endTime ? this.endTime : undefined;
           console.log(
             "大众看板结算与交货核对明细表-导出条件：" +
               JSON.stringify(this.listExportQuery)

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

@@ -8,7 +8,9 @@
         class="search-container"
         @value-change="JobVersionValue"
       ></JobSelectVerson>
+
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -16,6 +18,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -30,7 +41,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -68,7 +79,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -249,7 +260,7 @@ export default {
       page: 1,
       JobversionValue: "",
       JobversionValueVerson: "",
-      selectJobVersionValue: "0",
+      selectJobVersionValue: 0,
       dialogFormVisible: false,
       multipleSelection: [],
       formTitle: "",
@@ -267,7 +278,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -280,6 +291,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -364,16 +393,16 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
-      //版本下拉选择
+      this.selectJobVersionValue = params.value;
+      //alert(this.selectJobVersionValue);
+      this.searchContent = "";
       this.listQuery.Filters = [];
-      var column = "state";
       let filter = {
-        logic: 0,
+        Column: "state",
-        column: column,
+        Value: params.value,
-        action: 0,
+        Logic: 0,
-        value: params.value,
+        Action: 0,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -805,14 +834,7 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
+      console.log("详表查询条件：" + JSON.stringify(this.listQuery));
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmskanbanoutput/WmsKanbanDetailList",
@@ -832,21 +854,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "materialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -243,6 +243,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -251,6 +252,7 @@ export default {
       //tempsTabs.push({ label: "单据号", prop: "billNum", width: 150 });
       tempsTabs.push({ label: "创建人", prop: "creator", width: 160 });
       tempsTabs.push({ label: "创建时间", prop: "creationTime", width: 160 });
+
       //tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
       return tempsTabs;
     },
@@ -375,6 +377,7 @@ export default {
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+      console.log("主表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmskanbanoutput/WmsKanbanList",
@@ -466,7 +469,17 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      // if (column.property === "sumContent") {
+      //   return { textAlign: "left", background: "#a85d7e" };
+      // }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -22,6 +22,7 @@
         ></el-option>
       </el-select> -->
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -29,6 +30,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -43,7 +53,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >整单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -99,7 +109,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -296,7 +306,6 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        version: "",
       },
       listOutPutQuery: {
         version: "",
@@ -336,7 +345,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -349,6 +358,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -423,6 +450,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -432,8 +461,8 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
+      //this.selectJobVersionValue = params.value;
       this.getList();
     },
     handle(row) {
@@ -985,14 +1014,7 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
+      console.log("详表查询条件：" + JSON.stringify(this.listQuery));
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmskanbanoutputextend/WmsKanbanDetailList",
@@ -1012,21 +1034,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "sapMaterialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "sapMaterialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -306,6 +306,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -489,6 +490,7 @@ export default {
       } else {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
+      console.log("主表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmskanbanoutputextend/WmsKanbanList",
@@ -580,7 +582,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -1,4 +1,4 @@
-<!---明细数据-->
+<!--大众备件无单号出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -18,6 +18,7 @@
       ></JobSelectVerson>
 
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -25,6 +26,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -39,7 +49,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -77,7 +87,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -267,7 +277,6 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        version: "",
       },
       listOutPutQuery: {
         version: "",
@@ -307,7 +316,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -320,6 +329,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -415,6 +442,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -424,7 +453,6 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -827,14 +855,7 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
+      console.log("详表查询条件：" + JSON.stringify(this.listQuery));
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmsSharePartoutput/WmsSharePartDetailList",
@@ -854,21 +875,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "materialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -242,6 +242,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -465,7 +466,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -1,4 +1,4 @@
-<!--FIS发运数据对比输出表-明细数据-->
+<!--大众备件有单号出库单-->
 <template>
   <div class="cr-body-content">
     <flexbox class="content-header">
@@ -17,6 +17,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -24,6 +25,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -38,7 +48,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -76,7 +86,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -183,7 +193,7 @@ export default {
   data() {
     return {
       crmType: "sparepartOutOrder",
-       pickerOptions: {
+      pickerOptions: {
         //控制当前月之后不能选择
         disabledDate(time) {
           let date = new Date();
@@ -275,7 +285,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -288,6 +298,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -369,6 +397,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -378,7 +408,6 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -814,14 +843,7 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
+      console.log("详表查询条件：" + JSON.stringify(this.listQuery));
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmsSharePart90output/WmsSharePartDetailList",
@@ -841,21 +863,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "materialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -242,6 +242,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -465,7 +466,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -8,7 +8,16 @@
         class="search-container"
         @value-change="JobVersionValue"
       ></JobSelectVerson>
+      <!-- <el-button
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        @click="handleCreateBills()"
+        >确认出库单</el-button
+      > -->
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -16,6 +25,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -30,7 +48,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -68,7 +86,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -230,10 +248,10 @@ export default {
             value: "0",
           }, //默认查询可用的
         ],
+        //Filters: [],
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        state: "",
       },
       listOutPutQuery: {
         version: "",
@@ -253,7 +271,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 230,
+      tableHeight: document.documentElement.clientHeight - 210,
       isEdit: false,
       accountDatelist: {
         accountDate: "",
@@ -268,7 +286,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -281,6 +299,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -321,16 +357,15 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
-      //版本下拉选择
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       this.listQuery.Filters = [];
-      var column = "state";
       let filter = {
-        logic: 0,
+        Column: "state",
-        column: column,
+        Value: params.value,
-        action: 0,
+        Logic: 0,
-        value: params.value,
+        Action: 0,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
       this.getList();
     },
@@ -902,15 +937,7 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
-
+      console.log("详表查询条件：" + JSON.stringify(this.listQuery));
-      let filter = {
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
-      console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
           "/api/settleaccount/wmsjitoutput/WmsJitDetailList",
@@ -930,21 +957,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "materialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -250,6 +250,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -482,7 +483,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -9,6 +9,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -16,6 +17,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -30,13 +40,13 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >删除出库单
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照SAP零件号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -68,7 +78,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -267,7 +277,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -280,6 +290,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -375,6 +403,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -384,9 +414,7 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
-      //this.listQuery.state = params.value;
       this.getList();
     },
     save(row) {
@@ -811,13 +839,6 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
@@ -838,21 +859,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "sapMaterialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -243,6 +243,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -448,7 +449,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -10,6 +10,7 @@
       ></JobSelectVerson>
 
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -17,6 +18,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -31,7 +41,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >删除出库单
       </el-button>
       <el-input
         v-model="searchContent"
@@ -69,7 +79,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -218,6 +228,7 @@ export default {
           { required: true, message: "日期必须输入！", trigger: "blur" },
         ],
       },
+      selectJobVersionValue: "0",
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
@@ -259,7 +270,6 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        version: "",
       },
       listOutPutQuery: {
         version: "",
@@ -298,7 +308,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -311,6 +321,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -397,6 +425,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -885,6 +915,7 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
+
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
@@ -905,21 +936,25 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "materialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "sapMaterialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

vue/src/views/ux/vw/dataInput/OnetimeSale/index.vue

@@ -243,6 +243,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -448,7 +449,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

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

@@ -9,6 +9,7 @@
         @value-change="JobVersionValue"
       ></JobSelectVerson>
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -16,6 +17,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -30,13 +40,13 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照看板号搜索..."
+        placeholder="按照Sap编码搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -68,7 +78,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -235,6 +245,14 @@ export default {
         billNum: "",
       },
       listOutPutQuery: {
+         Filters: [
+          {
+            logic: 0,
+            column: "state",
+            action: 0,
+            value: "0",
+          }, //默认查询可用的
+        ],
         version: "",
         guids: "",
         billNum: "",
@@ -267,7 +285,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    // this.getList();
   },
   watch: {
     customerInfos: {
@@ -280,6 +298,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -307,7 +343,7 @@ export default {
         prop: "kanban",
         width: 150,
       });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 180 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
@@ -329,6 +365,17 @@ export default {
       this.listOutPutQuery.version = this.customerInfo.version;
       this.listOutPutQuery.billNum = this.customerInfo.parentId;
 
+      //版本下拉选择
+      this.listOutPutQuery.Filters = [];
+      var column = "state";
+      let filter = {
+        logic: 0,
+        column: column,
+        action: 0,
+        value:this.selectJobVersionValue,
+      };
+      this.listOutPutQuery.Filters.push(filter);
+
       console.log(
         "红旗H平台出库单导出：" + JSON.stringify(this.listOutPutQuery)
       );
@@ -373,6 +420,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -382,9 +431,7 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
-      //this.listQuery.state = params.value;
       this.getList();
     },
 
@@ -881,13 +928,7 @@ export default {
         this.listQuery.SkipCount = (this.page - 1) * 15;
       }
       this.listQuery.billNum = this.customerInfo.parentId;
-      let filter = {
+
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
@@ -908,21 +949,25 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "billNum";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "materialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

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

@@ -243,6 +243,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -466,7 +467,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

vue/src/views/ux/vw/dataInput/hq_h_sparepart/index.vue

@@ -27,7 +27,7 @@
           @click="handleDelete()"
           >删除(支持批量)</el-button
         >
-        <el-button
+        <!-- <el-button
           class="filter-item"
           type="success"
           icon="el-icon-check"
@@ -43,7 +43,7 @@
           v-loading="formLoading"
           @click="handleCreateBills()"
           >生成出库单(支持批量)</el-button
-        >
+        > -->
       </flexbox>
     </div>
     <!-- 刷新 -->
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="说明" width="400" align="center">
+      <!-- <el-table-column label="说明" width="400" align="center">
         <template slot-scope="scope">
           <el-input
             ref="inputRef"
@@ -138,7 +138,7 @@
             cancel
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column
         prop="stateName"
@@ -674,11 +674,11 @@ export default {
         width: 150,
       });
 
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "审批状态",
+      //   label: "审批状态",
-        prop: "fileName",
+      //   prop: "fileName",
-        width: 350,
+      //   width: 350,
-      });
+      // });
       return tempsTabs;
     },
   },

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

@@ -10,6 +10,7 @@
       ></JobSelectVerson>
 
       <el-button
+        v-if="this.selectJobVersionValue == 0"
         class="filter-item"
         type="success"
         icon="el-icon-check"
@@ -17,6 +18,15 @@
         @click="handleCreateBills()"
         >确认出库单</el-button
       >
+      <el-button
+        v-else
+        disabled
+        class="filter-item"
+        type="success"
+        icon="el-icon-check"
+        size="mini"
+        >确认出库单</el-button
+      >
       <el-button
         class="filter-item"
         size="mini"
@@ -31,7 +41,7 @@
         type="danger"
         icon="el-icon-download"
         @click="handleDelete()"
-        >删除出库单(支持批量)
+        >出库单删除
       </el-button>
       <el-input
         v-model="searchContent"
@@ -69,7 +79,7 @@
     <!--表格渲染-->
     <el-table
       ref="multipleTable"
-      v-loading="listLoading"
+      v-loading.fullscreen.lock="listLoading"
       element-loading-text="拼命加载中..."
       element-loading-spinner="el-icon-loading"
       class="cr-table"
@@ -260,7 +270,6 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         billNum: "",
-        version: "",
       },
       listOutPutQuery: {
         version: "",
@@ -299,7 +308,7 @@ export default {
     };
   },
   created() {
-    this.getList();
+    //this.getList();
   },
   watch: {
     customerInfos: {
@@ -312,6 +321,24 @@ export default {
             this.customerInfo.version = element.Version;
           });
           if (this.customerInfo.parentId != "") {
+            this.JobVersionList = [
+              { value: "0", label: "未处理" },
+              { value: "1", label: "申请出库" },
+              { value: "2", label: "确认出库" },
+              { value: "3", label: "不能出库" },
+              { value: "4", label: "取消出库" },
+            ];
+            this.selectJobVersionValue = 0;
+            //版本下拉选择
+            this.listQuery.Filters = [];
+            var column = "state";
+            let filter = {
+              logic: 0,
+              column: column,
+              action: 0,
+              value: "0",
+            };
+            this.listQuery.Filters.push(filter);
             this.getList();
           }
         }
@@ -402,6 +429,8 @@ export default {
     },
     //版本下拉列表选择项
     JobVersionValue(params) {
+      this.selectJobVersionValue = params.value;
+      this.searchContent = "";
       //版本下拉选择
       this.listQuery.Filters = [];
       var column = "state";
@@ -411,8 +440,8 @@ export default {
         action: 0,
         value: params.value,
       };
-      this.selectJobVersionValue = params.value;
       this.listQuery.Filters.push(filter);
+      //this.selectJobVersionValue = params.value;
       this.getList();
     },
     handle(row) {
@@ -889,13 +918,6 @@ export default {
       }
       this.listQuery.billNum = this.customerInfo.parentId;
 
-      let filter = {
-        Column: "state",
-        Value: this.selectJobVersionValue,
-        Logic: 0,
-        Action: 0,
-      };
-      this.listQuery.Filters.push(filter);
       console.log("查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
         .posts(
@@ -916,21 +938,24 @@ export default {
         });
     },
     /** 筛选操作 */
-    handleFilter() {
+    handleFilter(data) {
       this.page = 1;
-      this.getList();
       this.listQuery.Filters = [];
-      if (this.searchContent != "") {
+      if (data === null) {
-        var column = "sapMaterialCode";
+        this.getList(); //查询所有
-        let filter = {
+      } else {
-          logic: 0,
+        if (this.searchContent != "") {
-          column: column,
+          var column = "sapMaterialCode";
-          action: 6,
+          let filter = {
-          value: this.searchContent,
+            logic: 0,
-        };
+            column: column,
-        this.listQuery.Filters.push(filter);
+            action: 6,
+            value: this.searchContent,
+          };
+          this.listQuery.Filters.push(filter);
+        }
+        this.getList();
       }
-      this.getList();
     },
     /** 多项筛选操作 */
     /** 筛选操作 */

vue/src/views/ux/vw/dataInput/hq_kb_output/index.vue

@@ -243,6 +243,7 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({ label: "状态", prop: "sumContent", width: 160 });
       tempsTabs.push({
         label: "版本",
         prop: "version",
@@ -445,7 +446,11 @@ export default {
     },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      return { textAlign: "left" };
+      if (column.property === "sumContent") {
+        return { textAlign: "left", "font-weight": 700, color: "#FF6100" };
+      } else {
+        return { textAlign: "left" };
+      }
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();

vue/src/views/ux/vw/dataInput/hq_y_report/index.vue

@@ -27,7 +27,7 @@
           @click="handleDelete()"
           >删除(支持批量)</el-button
         >
-        <el-button
+        <!-- <el-button
           class="filter-item"
           type="success"
           icon="el-icon-check"
@@ -43,7 +43,7 @@
           v-loading="formLoading"
           @click="handleCreateBills()"
           >生成出库单(支持批量)</el-button
-        >
+        > -->
       </flexbox>
     </div>
     <!-- 刷新 -->
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="说明" width="400" align="center">
+      <!-- <el-table-column label="说明" width="400" align="center">
         <template slot-scope="scope">
           <el-input
             ref="inputRef"
@@ -138,7 +138,7 @@
             cancel
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column
         prop="stateName"
@@ -594,11 +594,11 @@ export default {
         width: 150,
       });
 
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "审批状态",
+      //   label: "审批状态",
-        prop: "fileName",
+      //   prop: "fileName",
-        width: 350,
+      //   width: 350,
-      });
+      // });
       return tempsTabs;
     },
   },

vue/static/config.js

@@ -2,8 +2,8 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			//ip: 'http://192.168.0.67',
+			ip: 'http://192.168.0.67',
-      ip: 'http://192.168.0.140',
+      //ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',