改变页尺寸时

vue/babel.config.js

@@ -2,4 +2,4 @@ module.exports = {
   presets: [
     '@vue/app'
   ]
-}
+}  

vue/public/config.js

@@ -0,0 +1,17 @@
+// 开发
+window.SITE_CONFIG['config_ip'] = 'http://192.168.1.228'
+window.SITE_CONFIG['config_auth_port'] = '8066'
+window.SITE_CONFIG['config_public_port'] = '8092'
+window.SITE_CONFIG['config_backend_port'] = '8092'
+
+
+// window.SITE_CONFIG['config_ip'] = 'http://127.0.0.1'
+// window.SITE_CONFIG['config_auth_port'] = '44344'
+// window.SITE_CONFIG['config_public_port'] = '44344'
+// window.SITE_CONFIG['config_backend_port'] = '44344'
+
+// 发布
+// window.SITE_CONFIG['config_ip'] = 'http://192.168.0.68'
+// window.SITE_CONFIG['config_auth_port'] = '8066'
+// window.SITE_CONFIG['config_public_port'] = '8092'
+// window.SITE_CONFIG['config_backend_port'] = '8092'

vue/public/index.html

@@ -7,6 +7,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+		<script>
+		  // 初始化
+		  window.SITE_CONFIG = {};
+		</script>
+		<script src="./config.js"></script>
 <!--    <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
     <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->
 

vue/src/App.vue

@@ -42,5 +42,10 @@
     },
 
   }
+	
+	localStorage.setItem('config_ip',window.SITE_CONFIG['config_ip'])
+	localStorage.setItem('config_auth_port',window.SITE_CONFIG['config_auth_port'])
+	localStorage.setItem('config_public_port',window.SITE_CONFIG['config_public_port'])
+	localStorage.setItem('config_backend_port',window.SITE_CONFIG['config_backend_port'])
 </script>
 

vue/src/components/ImportTxt/index.vue

@@ -346,6 +346,7 @@ export default {
           fis: "FIS发运数据",
           settleAccount: "R3数据",
           AssemblyCfgERP:"总成SAP数据",
+					PartCfg:"物料数据",
         }[this.crmType] || ""
       );
     },
@@ -355,6 +356,7 @@ export default {
           fis: "/api/settleaccount/fis/ExcelImport",
           settleAccount: "/api/settleaccount/SettleAccount/ExcelImport", 
           AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
+					PartCfg:"/api/newjit/part-cfg/import",
         }[this.crmType] || ""
       );
     },
@@ -365,6 +367,7 @@ export default {
           fis: "FIS发运数据导入模板.xlsx",
           settleAccount: "R3数据模板.xlsx",
           AssemblyCfgERP:"BOM-批量导入模板.txt",
+					PartCfg:"BOM-批量导入模板.txt",
         }[this.crmType] || ""
       );
     },
@@ -474,12 +477,13 @@ export default {
     beforeAvatarUpload(file) {
       var FileExt = file.name.replace(/.+\./, "");
       if (["txt"].indexOf(FileExt.toLowerCase()) === -1) {
-        this.$message({
+        // this.$message({
-          type: "warning",
+        //   type: "warning",
-          message: "只支持txt文本类型文件！",
+        //   message: "只支持txt文本类型文件！",
-        });
+        // });
-        this.isFileType = "0";
+        // this.isFileType = "0";
-        return false;
+        // return false;
+		this.isFileType = "1";
       } else {
         this.isFileType = "1";
       }
@@ -563,7 +567,7 @@ export default {
           .posts(webapi, fd)
           .then(async (res) => {
             console.log("导入条件：" + JSON.stringify(res));
-            if(this.crmType !== "AssemblyCfgERP"){
+            if(this.crmType !== "AssemblyCfgERP" && this.crmType !== "PartCfg"){
               if (res === "Success") {
                 if (this.isLt2M === "1" && this.isFileType === "1") {
                   this.$notify({

vue/src/router/index.js

@@ -64,11 +64,16 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    //component: () => import('@/views/login/index'),
+  component: () => import('@/views/login/index'),
-	//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
+	//component: () => import('@/views/pg-fis/basedate/customerPartCfg'),
-	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
+	//component: () => import('@/views/pg-fis/basedate/partSwitch'),
-	component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'),
-    hidden: true
+	//component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
+	//component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), //?? one
+	//component: () => import('@/views/pg-fis/basedate/select'), //M100查询
+	//component: () => import('@/views/pg-fis/basedate/m100BIll'), //M100单据信息维护
+	//component: () => import('@/views/pg-fis/basedate/r100Online'), //R100上线信息
+	//component: () => import('@/views/pg-fis/basedate/customerPartCfg'), //客户零件管理
   },
   {
     path: '/auth-redirect',
@@ -188,7 +193,7 @@ export const asyncRoutes = [
   //wheeldataRouter,//大众看板和备件
     pgfisPrint,//排序单打印
     pgfis,//派格fis
-  JobTimeDataRouter,//后台作业监控
+  //JobTimeDataRouter,//后台作业监控
 
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }

vue/src/settings.js

@@ -1,5 +1,6 @@
 module.exports = {
-  title: '长春派格汽车塑料技术有限公司结算管理系统',
+  // title: '长春派格汽车塑料技术有限公司结算管理系统',
+  title: '佛山FIS排序单打印系统',
 
   /**
    * @type {boolean} true | false

vue/src/views/login/index.vue

@@ -2,7 +2,11 @@
   <div class="wrapper">
     <div class="left">
 
-      <div class="container"><span class="one">SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统</span><span class="two"></span></div>
+      <div class="container">
+        <!-- <span class="one">SAS/JIT-长春派格汽车塑料技术有限公司结算管理系统</span> -->
+        <span class="one">佛山FIS排序单打印系统</span>
+        <span class="two"></span>
+      </div>
 
       <!-- <div class="container"><span class="one">闻荫科技-长春派格结算管理系统</span><span class="two"></span></div> -->
 
@@ -10,9 +14,8 @@
       <div class="">
         <div class="copyright">
           长春市闻荫科技
-          <a
+          <!-- <a target="_blank" href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a> -->
-            target="_blank"
+          <a target="_blank" href="http://www.ccwin-in.com">©2021 闻荫科技-佛山FIS排序单打印系统</a>
-            href="http://www.ccwin-in.com">©2021 闻荫科技-长春派格结算管理系统</a>
         </div>
       </div>
     </div>

vue/src/views/newJit/baseData/excludePartCfgs/index.vue

@@ -151,7 +151,7 @@ export default {
     };
   },
   created() {
-		debugger
+		//debugger
 		console.log("进入excludePartCfgs模块");
 
     this.getList();
@@ -193,7 +193,7 @@ export default {
 			//debugger
       this.isLoading = true;
 			console.log(JSON.stringify(this.inputParam))
-			debugger
+			//debugger
       this.$axios
 				.gets("/api/newjit/exclude-part-cfg/getlist", this.inputParam)
 				//.posts("/api/newjit/exclude-part-cfg/get-list", this.inputParam) 
@@ -301,12 +301,12 @@ export default {
         type: "warning",
       })
         .then(() => {
-					debugger
+					//debugger
 					var arrStr = params.join();
 							this.$axios
 									  .deletes("/api/newjit/exclude-part-cfg/delete/" + arrStr)
 									  .then((response) => {
-											debugger
+											//debugger
 									    if (response.status)
 											{
 												this.$notify({
@@ -336,7 +336,7 @@ export default {
 		 */
     async handleExport() {
       this.isLoading = true;
-			debugger
+			//debugger
 			this.$axios
 				.BolbGets("/api/newjit/exclude-part-cfg/export", this.inputParam)
 			  .then((res) => {

vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@@ -40,13 +40,13 @@
 					</el-form-item>
 					<!-- <el-divider class="divider1" ></el-divider> -->
 					<el-form-item style="margin-bottom: 0px; ">
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate" disabled>新增
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate"  disabled>新增
 						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate" disabled>修改
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate"  disabled>修改
 						</el-button>
 						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-delete" @click="handleDelete" disabled>删除
 						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" disabled>导入（SAP对接）
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入（SAP对接）
 						</el-button>
 					</el-form-item>
 				</el-form>
@@ -182,7 +182,7 @@
 			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.maxResultCount"
 			 @pagination="getList" />
 			<!-- 导入Excel组件 -->
-			<importExcel ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="importExcelData" />
+			<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />
 		</div>
 		<!-- 抽屉控件 -->
 		<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
@@ -197,7 +197,8 @@
 	import Pagination from "@/components/Pagination";
 	import permission from "@/directive/permission/index.js";
 	import CRMTableHead from "../../components/CRMTableHead";
-	import importExcel from "@/components/ImportTxt";
+	import importExcelCtrl from "@/components/ImportTxt";
+	//import importExcelCtrl from "@/components/ImportExcel";
 	import Lockr from "lockr";
 	import moment from "moment";
 	import Detail from "./detail.vue";
@@ -229,7 +230,7 @@
 		components: {
 			Pagination,
 			CRMTableHead,
-			importExcel,
+			importExcelCtrl,
 			Detail
 		},
 		directives: {
@@ -565,7 +566,7 @@
 			selectOptionsChange(item) {
 				this.getList();
 			},
-			importExcelData() {
+			onImportExcelDlgClosed() {
 				//关闭导入窗体时调用
 				this.listLoading = false;
 				this.showExcelImport = false;

vue/src/views/pg-fis/basedate/customerPartCfg/index.vue

@@ -117,6 +117,11 @@
           >导出Excel
         </el-button>
       </el-form-item>
+			<el-form-item>
+				<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入零件
+</el-button>				
+				
+			</el-form-item>
       <!--表格头组件，filter查询-->
       <!-- <c-r-m-table-head
         ref="crmTableHead"
@@ -187,13 +192,8 @@
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
       />
-      <!-- 导入Excel组件 -->
+			<!-- 导入Excel组件 -->
-      <importExcel
+			<importExcelCtrl ref="importexcel" :show="showExcelImport" :crmType="crmType" @close="onImportExcelDlgClosed" />			
-        ref="importexcel"
-        :show="showExcelImport"
-        :crmType="crmType"
-        @close="importExcelData"
-      />
     </div>
   </div>
 </template>
@@ -201,7 +201,8 @@
 <script>
 import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 import permission from "@/directive/permission/index.js";
-import importExcel from "@/components/ImportExcel-invoice";
+//import importExcelCtrl from "@/components/ImportExcel-invoice";
+import importExcelCtrl from "@/components/ImportTxt";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
 import Lockr from "lockr";
@@ -210,7 +211,7 @@ import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
 
 export default {
   name: "CustomerPartCfg",
-  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  components: { Pagination, CRMTableHead, importExcelCtrl, XhJSSelect },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -310,6 +311,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
+			crmType: "PartCfg",
       tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
       sortState:false, //标记刷新是否是排序调用
@@ -481,12 +483,12 @@ export default {
       }
       return row[column.property] || "--";
     },
-    importExcelData() {
+		onImportExcelDlgClosed() {
-      //this.getVersionInfo();
+			//关闭导入窗体时调用
-      this.listLoading = false;
+			this.listLoading = false;
-      //关闭导入窗体时调用
+			this.showExcelImport = false;
-      this.showExcelImport = false;
+			this.getList();
-    },
+		},
     //导出功能
     async handleDownload() {
       this.listLoading = true;
@@ -753,7 +755,12 @@ export default {
           .catch(() => {
           });
     },
-  },
+		handleImportSAP() {
+			//导入
+			this.showExcelImport = true;
+			this.$refs.importexcel.handleImportExcelClick();
+		},
+  }, //method
 };
 </script>
 

vue/src/views/pg-fis/basedate/m100BIll/detail.vue

@@ -148,6 +148,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+		billId: ""
       },
       form: {
         dicDetailID: "",
@@ -206,6 +207,7 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+			this.customerInfo.billId = element.BillId;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -270,7 +272,7 @@ export default {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
       //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
       this.$axios
         .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
         .then((response) => {

vue/src/views/pg-fis/basedate/m100BIll/index.vue

@@ -42,6 +42,23 @@
             :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
+				
+          <el-form-item label="大众工位" prop="fwStation" v-show="listQuery.productType == 2">
+            <el-select
+              v-model="listQuery.fwStation"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+            >
+              <el-option
+                v-for="item in fwStationList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>				
 
           <el-form-item label="版本:" prop="Version">
             <el-input
@@ -638,6 +655,7 @@ export default {
         SkipCount: 0,
         MaxResultCount: 15,
         productType: 1,
+		fwStation : "BA2", //大众工位
         ProductLine: undefined,
         version:undefined,
         HostSNBegin:undefined,
@@ -725,7 +743,11 @@ export default {
         dicTypeName:"派格车型",
       },
       vehicleModelList:[],//车型list
-	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
+      productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
+      fwStationList: [
+        { id: "BA2", name: "BA2" },
+        { id: "BA5", name: "BA5" }
+      ],		
       gettime:"",
       KNRlist:null,
     };
@@ -810,6 +832,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },

vue/src/views/pg-fis/basedate/m100Online/detail.vue

@@ -1,31 +1,13 @@
 <!--M100上线信息-明细数据-->
 <template>
-  <div class="cr-body-content">
+	<div class="cr-body-content">
-    <!--表格渲染-->
+		<!--表格渲染-->
-    <el-table
+		<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
-      ref="multipleTable"
+		 class="cr-table" :data="list" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle" size="small"
-      v-loading="listLoading"
+		 stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
-      element-loading-text="拼命加载中..."
+		 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
-      element-loading-spinner="el-icon-loading"
+			<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      class="cr-table"
+			<!-- <el-table-column
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
         prop="总成名称"
         label="erpAssemblyName"
         sortable
@@ -42,313 +24,325 @@
             class="two-list"
       </el-table-column> -->
 
-      <el-table-column type="expand" prop="details">
+			<el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
+				<template slot-scope="scope">
-          <el-table :data="scope.row.details">
+					<el-table :data="scope.row.details">
-            <el-table-column
+						<el-table-column prop="partCode" label="客户零件代码"></el-table-column>
-              prop="partCode"
+						<el-table-column prop="partNum" label="客户零件数量"></el-table-column>
-              label="客户零件代码"
+						<el-table-column prop="description" label="描述"></el-table-column>
-            ></el-table-column>
+						<el-table-column prop="isKey" label="是否Key件">
-            <el-table-column
+							<template slot-scope="scope">
-              prop="partNum"
+								<span v-if="scope.row.isKey == true">
-              label="客户零件数量"
+									<span style="color: #00b46d">是</span>
-            ></el-table-column>
+								</span>
-            <el-table-column prop="description" label="描述"></el-table-column>
+								<span v-else>
-            <el-table-column prop="isKey" label="是否Key件">
+									<span style="color: #d75c89">否</span>
-              <template slot-scope="scope">
+								</span>
-                <span v-if="scope.row.isKey == true">
+							</template>
-                  <span style="color: #00b46d">是</span>
+						</el-table-column>
-                </span>
+					</el-table>
-                <span v-else>
+				</template>
-                  <span style="color: #d75c89">否</span>
+			</el-table-column>
-                </span>
+			<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
-              </template>
+			 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
-            </el-table-column>
+				<template slot="header" slot-scope="scope">
-          </el-table>
+					{{ scope.column.label }}
-        </template>
+				</template>
-      </el-table-column>
+			</el-table-column>
-      <el-table-column
+			<el-table-column prop="erpAssemblyVersion" label="总成版本号" sortable width="360">
-        v-for="(item, index) in getDefaultField"
+			</el-table-column>
-        :key="index"
+		</el-table>
-        :prop="item.prop"
+		<div class="table-footer">
-        :label="item.label"
+			<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        :min-width="item.width"
+			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.MaxResultCount"
-        :formatter="fieldFormatter"
+			 @pagination="getList" />
-        sortable="custom"
+		</div>
-        show-overflow-tooltip
+	</div>
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+	import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
+	import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
+	import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
+	import {
-import Detail from "./detail";
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import Detail from "./detail";
 
-export default {
+	export default {
-  name: "sendUnsettledDiffReport",
+		name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
+		components: {
-  directives: { permission },
+			Pagination,
-  filters: {
+			CRMTableHead,
-    IsCustomerSignFilter(status) {
+			Detail
-      //翻译是否签字
+		},
-      const statusMap = {
+		directives: {
-        true: "是",
+			permission
-        false: "否",
+		},
-      };
+		filters: {
-      return statusMap[status];
+			IsCustomerSignFilter(status) {
-    },
+				//翻译是否签字
-  },
+				const statusMap = {
-  props: {
+					true: "是",
-    customerInfos: {
+					false: "否",
-      type: Array,
+				};
-      default: () => {
+				return statusMap[status];
-        return [];
+			},
-      },
+		},
-    },
+		props: {
-  },
+			customerInfos: {
-  data() {
+				type: Array,
-    return {
+				default: () => {
-      crmType: "stockFisDiffReport",
+					return [];
-      rules: {
+				},
-        //前端定义的规则，后端也有验证
+			},
-        erpMaterialCode: [
+		},
-          { required: true, message: "必须输入！", trigger: "blur" },
+		data() {
-        ],
+			return {
-      },
+				crmType: "stockFisDiffReport",
-      expands: [], //只展开一行放入当前行id
+				rules: {
-      getRowKeys: (row) => {
+					//前端定义的规则，后端也有验证
-        return row.id; //这里看这一行中需要根据哪个属性值是id
+					erpMaterialCode: [{
-      },
+						required: true,
-      searchContent: "", // 输入内容
+						message: "必须输入！",
-      customerInfo: {
+						trigger: "blur"
-        parentId: "",
+					}, ],
-      },
+				},
-      form: {
+				expands: [], //只展开一行放入当前行id
-        dicDetailID: "",
+				getRowKeys: (row) => {
-        customerId: "",
+					return row.id; //这里看这一行中需要根据哪个属性值是id
-        projectId: "",
+				},
-      },
+				searchContent: "", // 输入内容
-      list: null,
+				customerInfo: {
-      totalCount: 0,
+					parentId: "",
-      listLoading: true,
+					billId: ""
-      formLoading: false,
+				},
-      // 高级搜索
+				form: {
-      filterObj: {
+					dicDetailID: "",
-        type: Object,
+					customerId: "",
-        default: () => {
+					projectId: "",
-          return {};
+				},
-        },
+				list: null,
-      },
+				totalCount: 0,
-      listQuery: {
+				listLoading: true,
-        Filters: [
+				formLoading: false,
-          {
+				// 高级搜索
-            logic: 0,
+				filterObj: {
-            column: "Enabled",
+					type: Object,
-            action: 0,
+					default: () => {
-            value: "true",
+						return {};
-          }, //默认查询可用的
+					},
-        ],
+				},
-        SkipCount: 0,
+				listQuery: {
-        MaxResultCount: 15,
+					Filters: [{
-        id: "",
+							logic: 0,
-      },
+							column: "Enabled",
-      page: 1,
+							action: 0,
-      dialogFormVisible: false,
+							value: "true",
-      multipleSelection: [],
+						}, //默认查询可用的
-      formTitle: "",
+					],
-      drawer: false,
+					SkipCount: 0,
-      showExcelImport: false,
+					MaxResultCount: 15,
-      tableHeight: document.documentElement.clientHeight - 30,
+					id: "",
-      isEdit: false,
+				},
-    };
+				page: 1,
-  },
+				dialogFormVisible: false,
-  mounted() {
+				multipleSelection: [],
-    var self = this;
+				formTitle: "",
-    window.onresize = function () {
+				drawer: false,
-      var offsetHei = document.documentElement.clientHeight;
+				showExcelImport: false,
-      self.tableHeight = offsetHei - 30;
+				tableHeight: document.documentElement.clientHeight - 30,
-    };
+				isEdit: false,
-  },
+			};
-  created() {
+		},
-    this.getList();
+		mounted() {
-  },
+			var self = this;
-  watch: {
+			window.onresize = function() {
-    customerInfos: {
+				var offsetHei = document.documentElement.clientHeight;
-      handler(newVal) {
+				self.tableHeight = offsetHei - 30;
-        if (newVal == "" || newVal == "undefined") {
+			};
-          //TODO
+		},
-        } else {
+		created() {
-          newVal.forEach((element) => {
+			this.getList();
-            this.customerInfo.parentId = element.ParentId;
+		},
-          });
+		watch: {
-          if (this.customerInfo.parentId != "") {
+			customerInfos: {
-            this.getList();
+				handler(newVal) {
-          }
+					//debugger
-        }
+					if (newVal == "" || newVal == "undefined") {
-      },
+						//TODO
-      immediate: true,
+					} else {
-    },
+						newVal.forEach((element) => {
-  },
+							this.customerInfo.parentId = element.ParentId;
-  computed: {
+							this.customerInfo.billId = element.BillId;
-    /** 列表字段 */
+						});
-    getDefaultField() {
+						if (this.customerInfo.parentId != "") {
-      var tempsTabs = [];
+							this.getList();
-      tempsTabs.push({
+						}
-        label: "总成编号",
+					}
-        prop: "erpAssemblyCode",
+				},
-        width: 160,
+				immediate: true,
-      });
+			},
-      tempsTabs.push({
+		},
-        label: "总成名称",
+		computed: {
-        prop: "erpAssemblyName",
+			/** 列表字段 */
-        width: 160,
+			getDefaultField() {
-      });
+				var tempsTabs = [];
-      // tempsTabs.push({
+				tempsTabs.push({
-      //   label: "总成版本号",
+					label: "总成编号",
-      //   prop: "erpAssemblyName",
+					prop: "erpAssemblyCode",
-      //   width: 160,
+					width: 160,
-      // });
+				});
-      return tempsTabs;
+				tempsTabs.push({
-    },
+					label: "总成名称",
-  },
+					prop: "erpAssemblyName",
-  methods: {
+					width: 160,
-    exChange(row, rowList) {
+				});
-      this.loading = true;
+				// tempsTabs.push({
+				//   label: "总成版本号",
+				//   prop: "erpAssemblyName",
+				//   width: 160,
+				// });
+				return tempsTabs;
+			},
+		},
+		methods: {
+			exChange(row, rowList) {
+				this.loading = true;
 
-      var that = this;
+				var that = this;
-      if (rowList.length) {
+				if (rowList.length) {
-        that.expands = [];
+					that.expands = [];
-        if (row) {
+					if (row) {
-          that.expands.push(row.id); // 只展开当前行id
+						that.expands.push(row.id); // 只展开当前行id
-        }
+					}
-      } else {
+				} else {
-        that.expands = [];
+					that.expands = [];
-      }
+				}
-    },
+			},
-    /** 刷新列表 */
+			/** 刷新列表 */
-    handleHandle(data) {
+			handleHandle(data) {
-      if (data.type !== "edit") {
+				if (data.type !== "edit") {
-        this.getList();
+					this.getList();
-      }
+				}
-    },
+			},
-    /** 格式化字段 */
+			/** 格式化字段 */
-    fieldFormatter(row, column) {
+			fieldFormatter(row, column) {
-      return row[column.property] || "--";
+				return row[column.property] || "--";
-    },
+			},
-    importExcelData() {
+			importExcelData() {
-      //关闭导入窗体时调用
+				//关闭导入窗体时调用
-      this.showExcelImport = false;
+				this.showExcelImport = false;
-      this.getList();
+				this.getList();
-    },
+			},
-    getList() {
+			getList() {
-      this.listLoading = true;
+				this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+				console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+				//alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+				let vehicleAssemblyId = {
-      this.$axios
+					vehicleAssemblyId: this.customerInfo.parentId,
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
+					billId: this.customerInfo.billId
-        .then((response) => {
+				};
-          this.list = response;
+				this.$axios
-          setTimeout(() => {
+					.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-            //大数据量加载时
+					.then((response) => {
-            this.listLoading = false;
+						this.list = response;
-          }, 500);
+						setTimeout(() => {
-        })
+							//大数据量加载时
-        .catch(() => {
+							this.listLoading = false;
-          this.listLoading = false;
+						}, 500);
-        });
+					})
-    },
+					.catch(() => {
-    /** 筛选操作 */
+						this.listLoading = false;
-    handleFilter() {
+					});
-      this.page = 1;
+			},
-      this.getList();
+			/** 筛选操作 */
-      this.listQuery.Filters = [];
+			handleFilter() {
-      if (this.searchContent != "") {
+				this.page = 1;
-        var column = "partCode";
+				this.getList();
-        let filter = {
+				this.listQuery.Filters = [];
-          logic: 0,
+				if (this.searchContent != "") {
-          column: column,
+					var column = "partCode";
-          action: 6,
+					let filter = {
-          value: this.searchContent,
+						logic: 0,
-        };
+						column: column,
-        this.listQuery.Filters.push(filter);
+						action: 6,
-      }
+						value: this.searchContent,
-      this.getList();
+					};
-    },
+					this.listQuery.Filters.push(filter);
-    resetQuery() {},
+				}
+				this.getList();
+			},
+			resetQuery() {},
 
-    sortChange(data) {
+			sortChange(data) {
-      const { prop, order } = data;
+				const {
-      if (!prop || !order) {
+					prop,
-        this.handleFilter();
+					order
-        return;
+				} = data;
-      }
+				if (!prop || !order) {
-      this.listQuery.Sorting = prop + " " + order;
+					this.handleFilter();
-      this.handleFilter();
+					return;
-    },
+				}
-    handleSelectionChange(val) {
+				this.listQuery.Sorting = prop + " " + order;
-      this.multipleSelection = val;
+				this.handleFilter();
-    },
+			},
-    /** 通过回调控制style */
+			handleSelectionChange(val) {
-    cellStyle({ row, column, rowIndex, columnIndex }) {
+				this.multipleSelection = val;
-      if (
+			},
-        column.property === "fisQty" ||
+			/** 通过回调控制style */
-        column.property === "diffQty" ||
+			cellStyle({
-        column.property === "stockQty"
+				row,
-      ) {
+				column,
-        return { textAlign: "right" };
+				rowIndex,
-      } else {
+				columnIndex
-        return { textAlign: "left" };
+			}) {
-      }
+				if (
-    },
+					column.property === "fisQty" ||
-    /** 通过回调控制表头style */
+					column.property === "diffQty" ||
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+					column.property === "stockQty"
-      if (
+				) {
-        column.property === "fisQty" ||
+					return {
-        column.property === "diffQty" ||
+						textAlign: "right"
-        column.property === "stockQty"
+					};
-      ) {
+				} else {
-        return { textAlign: "right", background: "#FAFAFA" };
+					return {
-      } else {
+						textAlign: "left"
-        return { textAlign: "left", background: "#FAFAFA" };
+					};
-      }
+				}
-    },
+			},
-    handleRowClick(row, column, event) {
+			/** 通过回调控制表头style */
-      //this.$refs.multipleTable.clearSelection();
+			headerRowStyle({
-      this.$refs.multipleTable.toggleRowSelection(row);
+				row,
-    },
+				column,
-  },
+				rowIndex,
-};
+				columnIndex
+			}) {
+				if (
+					column.property === "fisQty" ||
+					column.property === "diffQty" ||
+					column.property === "stockQty"
+				) {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+		},
+	};
 </script>
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
+	@import "../../../pg-fis/styles/crmtable.scss";
-</style>
+</style>
-

vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@@ -1,765 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      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.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-

vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

@@ -1,746 +0,0 @@
-<!--总成模块信息管理页-->
-<template>
-  <div class="cr-body-content">
-    <div ref="box">
-      <flexbox class="content-header">
-        <el-form
-          :model="listQuery"
-          ref="queryForm"
-          v-show="showSearch"
-          :inline="true"
-        >
-          <el-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item style="margin-top: -20px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.$nextTick(() => {
-      var offsetHei = document.documentElement.clientHeight;
-      //console.log(offsetHei);
-      let boxH = this.$refs.box.offsetHeight;
-      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      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.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
-
-    selectOptionsChange(item) {
-      this.getList();
-    },
-
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || column.property == "receiveTime") {
-        var date = row[column.property];
-        if (date == undefined) {
-          return "";
-        }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
-      }
-      return row[column.property] || "--";
-    },
-    roleFilter(type) {
-      return projectTypeKeyValue[type];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
-</script>
-
-
-
-<style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-

vue/src/views/pg-fis/basedate/m100Online/~old/detailMB.vue

@@ -0,0 +1,683 @@
+<!--总成模块信息管理页-->
+<template>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
+
+					<el-form-item style="margin-top: -20px">
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()">重打(只支持单选)</el-button>
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
+							<el-table-column prop="topBoxPositionNum" label="上箱位号"></el-table-column>
+							<el-table-column prop="topSAPMaterialNum" label="上箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="topMaterialDescription" label="上箱位 物料描述"></el-table-column>
+							<el-table-column prop="belowBoxPositionNum" label="下箱位号"></el-table-column>
+							<el-table-column prop="belowSAPMaterialNum" label="下箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="belowMaterialDescription " label="下箱位 物料描述"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import Pagination from "@/components/Pagination";
+	import permission from "@/directive/permission/index.js";
+	import CRMTableHead from "../../components/CRMTableHead";
+	import importExcel from "@/components/ImportExcel-vw";
+	import Lockr from "lockr";
+	import {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosMB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				var offsetHei = document.documentElement.clientHeight;
+				//console.log(offsetHei);
+				let boxH = this.$refs.box.offsetHeight;
+				this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosMB: {
+				handler(newVal) {
+					console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = element.PrintType;
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
+
+				tempsTabs.push({
+					label: "起底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "止底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
+
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				this.listQuery.beginVin = this.listQuery.beginVin;
+				this.listQuery.endVin = this.listQuery.endVin;
+				this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+				this.listQuery.endHostSN = this.listQuery.endHostSN;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
+
+				console.log(JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/MenBanPackingList/MenBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].beginVin1;
+					let endVin1 = this.multipleSelection[0].endVin1;
+					var params = {
+						printType: 1,
+						productLine: this.customerInfo.productLine,
+						beginVin: beginVin1,
+						endVin: endVin1,
+					};
+					console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+						.then((response) => {
+							//alert(response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=menban",
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				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.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/MenBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
+
+			selectOptionsChange(item) {
+				this.getList();
+			},
+
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || column.property == "receiveTime") {
+					var date = row[column.property];
+					if (date == undefined) {
+						return "";
+					}
+					return moment(date).format("YYYY-MM-DD HH:mm:ss");
+				}
+				return row[column.property] || "--";
+			},
+			roleFilter(type) {
+				return projectTypeKeyValue[type];
+			},
+			//门板
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+			},
+
+			sortChange(data) {
+				const {
+					prop,
+					order
+				} = data;
+				if (!prop || !order) {
+					this.handleFilter();
+					return;
+				}
+				this.listQuery.Sorting = prop + " " + order;
+				this.handleFilter();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			/** 通过回调控制style */
+			cellStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right"
+					};
+				} else {
+					return {
+						textAlign: "left"
+					};
+				}
+			},
+			/** 通过回调控制表头style */
+			headerRowStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+
+			closeDialog() {},
+		},
+	};
+</script>
+
+
+
+<style lang="scss" scoped>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>

vue/src/views/pg-fis/basedate/m100Online/~old/detailZHB.vue

@@ -0,0 +1,681 @@
+<!--总成模块信息管理页-->
+<template>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
+
+					<el-form-item style="margin-top: -20px">
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()">重打(只支持单选)</el-button>
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="partCode" label="柱护板零件号"></el-table-column>
+							<el-table-column prop="partCode2" label="柱护板零件号2"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import Pagination from "@/components/Pagination";
+	import permission from "@/directive/permission/index.js";
+	import CRMTableHead from "../../components/CRMTableHead";
+	import importExcel from "@/components/ImportExcel-vw";
+	import Lockr from "lockr";
+	import {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosZHB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "1",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		mounted() {
+			this.$nextTick(() => {
+				var offsetHei = document.documentElement.clientHeight;
+				//console.log(offsetHei);
+				let boxH = this.$refs.box.offsetHeight;
+				this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosZHB: {
+				handler(newVal) {
+					console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = "1";
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
+
+				tempsTabs.push({
+					label: "起底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "止底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				alert("ifr.src:" + JSON.stringify(ifr.src))
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
+
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				this.listQuery.beginVin = this.listQuery.beginVin;
+				this.listQuery.endVin = this.listQuery.endVin;
+				this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+				this.listQuery.endHostSN = this.listQuery.endHostSN;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
+
+				console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].beginVin1;
+					let endVin1 = this.multipleSelection[0].endVin1;
+					var params = {
+						printType: 1,
+						productLine: this.customerInfo.productLine,
+						beginVin: beginVin1,
+						endVin: endVin1,
+					};
+					console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+					let _this = this;
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+						.then((response) => {
+							console.log("柱护版-打印返回的状态：" + response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				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.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
+
+			selectOptionsChange(item) {
+				this.getList();
+			},
+
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || column.property == "receiveTime") {
+					var date = row[column.property];
+					if (date == undefined) {
+						return "";
+					}
+					return moment(date).format("YYYY-MM-DD HH:mm:ss");
+				}
+				return row[column.property] || "--";
+			},
+			roleFilter(type) {
+				return projectTypeKeyValue[type];
+			},
+			//门板
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+			},
+
+			sortChange(data) {
+				const {
+					prop,
+					order
+				} = data;
+				if (!prop || !order) {
+					this.handleFilter();
+					return;
+				}
+				this.listQuery.Sorting = prop + " " + order;
+				this.handleFilter();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			/** 通过回调控制style */
+			cellStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right"
+					};
+				} else {
+					return {
+						textAlign: "left"
+					};
+				}
+			},
+			/** 通过回调控制表头style */
+			headerRowStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+
+			closeDialog() {},
+		},
+	};
+</script>
+
+
+
+<style lang="scss" scoped>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>

vue/src/views/pg-fis/basedate/m100Online/index-old.vue → vue/src/views/pg-fis/basedate/m100Online/~old/index-old.vue

@@ -702,6 +702,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+		  BillId: param.id
         },
       ];
     },
@@ -1249,6 +1250,7 @@ export default {
                   } else if (this.listQuery.productType === 2) {
                     //柱护板
                     //传递大众顺序号起止
+					let _this = this;
                     this.$axios
                       .posts(
                         "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1274,7 +1276,7 @@ export default {
                           console.log(this.fileQuery.dataname);
                           this.$axios
                             .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
+                              "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
                               qs.stringify(this.fileQuery)
                             )
                             .then((response) => {

vue/src/views/pg-fis/basedate/m100Online/index.vue → vue/src/views/pg-fis/basedate/m100Online/~old/index.vue

@@ -737,6 +737,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },
@@ -897,7 +898,7 @@ export default {
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
-						debugger
+						//debugger
           }, 500);
         })
         .catch(() => {
@@ -1290,6 +1291,7 @@ export default {
                   } else if (this.listQuery.productType === 2) {
                     //柱护板
                     //传递大众顺序号起止
+					let _this = this;
                     this.$axios
                       .posts(
                         "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1315,7 +1317,7 @@ export default {
                           console.log(this.fileQuery.dataname);
                           this.$axios
                             .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
+                              "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
                               qs.stringify(this.fileQuery)
                             )
                             .then((response) => {

vue/src/views/pg-fis/basedate/partSwitch/index.vue

@@ -186,7 +186,7 @@
 			});
 		},
 		created() {
-			debugger
+			//debugger
 			this.getList();
 			
 		},

vue/src/views/pg-fis/basedate/productLine/index.vue

@@ -936,7 +936,7 @@ export default {
             "/api/newjit/product-line-authority/do-authority",this.saveQuery
           )
           .then((response) => {
-            debugger
+            //debugger
             console.log(response);
             this.dialogFormVisible = false;
             this.getList();

vue/src/views/pg-fis/basedate/r100Online/detail.vue

@@ -148,6 +148,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+		billId: ""
       },
       form: {
         dicDetailID: "",
@@ -206,6 +207,7 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+			this.customerInfo.billId = element.BillId;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -270,7 +272,7 @@ export default {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
       //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId  };
       this.$axios
         .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
         .then((response) => {

vue/src/views/pg-fis/basedate/r100Online/index.vue

@@ -501,6 +501,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },

vue/src/views/pg-fis/basedate/repeatR100/index.vue

@@ -811,7 +811,7 @@ this.$axios
     },
       //产线类型变更
     ptypeselectChange() {
-      debugger
+      //debugger
       this.$forceUpdate();
       //console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
       this.listQuery.productLine = "";

vue/src/views/pg-fis/basedate/select/detail.vue

@@ -148,6 +148,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+		billId: ""
       },
       form: {
         dicDetailID: "",
@@ -206,6 +207,7 @@ export default {
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+			this.customerInfo.billId = element.BillId;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -270,7 +272,7 @@ export default {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
       //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId };
       this.$axios
         .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
         .then((response) => {

vue/src/views/pg-fis/basedate/select/index.vue

@@ -211,23 +211,23 @@
       </flexbox>
     </div>
     <!--门板重打和作废-->
-    <el-drawer
+<!--    <el-drawer
       title="门板作废和重打"
       :visible.sync="drawerMB"
       direction="rtl"
       size="65%"
     >
       <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
-    </el-drawer>
+    </el-drawer> -->
     <!--柱护板重打和作废-->
-    <el-drawer
+<!--    <el-drawer
       title="柱护板作废和重打"
       :visible.sync="drawerZHB"
       direction="rtl"
       size="65%"
     >
       <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
-    </el-drawer>
+    </el-drawer> -->
 
     <div class="l-table" style="margin-top: -30px">
       <!--表格渲染-->
@@ -392,8 +392,8 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
+//import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
+//import ZHBDetail from "./detailZHB.vue";
 import { mapGetters } from "vuex";
 import moment from "moment";
 
@@ -419,8 +419,8 @@ export default {
     CRMTableHead,
     importExcel,
     Detail,
-    MBDetail,
+    //MBDetail,
-    ZHBDetail,
+    //ZHBDetail,
   },
   directives: { permission },
   filters: {
@@ -445,8 +445,8 @@ export default {
     return {
       chkindex: 0, //复选按钮选择索引
       crmType: "select",
-      drawerZHB: false,
+      //drawerZHB: false,
-      drawerMB: false,
+      //drawerMB: false,
       activeNames: ["1"],
       rules: {
         erpAssemblyName: [
@@ -634,8 +634,13 @@ export default {
         width: 120,
       });
       tempsTabs.push({
-        label: "柱护板状态",
+        label: "柱护板状态BA2",
-        prop: "printBillNum",
+        prop: "bA2",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "柱护板状态BA5",
+        prop: "bA5",
         width: 120,
       });
       tempsTabs.push({
@@ -672,6 +677,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },
@@ -797,6 +803,14 @@ export default {
       if (column.property === "billStatus") {
         return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
       }
+      if (column.property === "bA2") {
+        return { null: "未打印", 0: "未打印", 1: "已打印" }[row[column.property]];
+      }
+      if (column.property === "bA5") {
+        return { null: "未打印", 0: "未打印", 1: "已打印" }[row[column.property]];
+      }
+	  
+	  
       if (column.property == "onlineTime" || column.property == "receiveTime") {
         var date = row[column.property];
         if (date == undefined) {
@@ -812,6 +826,8 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
+		
+		
     getList(data) {
       this.listLoading = true;
       if (data != undefined) {
@@ -1199,7 +1215,7 @@ export default {
             console.log("检查hostsn大众顺序号是否断号");
             console.log(response);
             if (response.item.length > 0) {
-              this.$confirm("本次打印存在断号是否继续?", "提示", {
+              this.$confirm("本次打印存在断号，是否继续?", "提示", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning",
@@ -1248,6 +1264,7 @@ export default {
                   } else if (this.listQuery.productType === 2) {
                     //柱护板
                     //传递大众顺序号起止
+					let _this = this;
                     this.$axios
                       .posts(
                         "/api/newjit/bill-m100/print-zhuhuban-packing-list",
@@ -1273,7 +1290,7 @@ export default {
                           console.log(this.fileQuery.dataname);
                           this.$axios
                             .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
+                              "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
                               qs.stringify(this.fileQuery)
                             )
                             .then((response) => {

vue/src/views/pg-fis/basedate/select/detailZHB.vue → vue/src/views/pg-fis/basedate/select/~old/detailZHB.vue

@@ -553,6 +553,7 @@ export default {
           endVin: endVin1,
         };
         console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+		let _this = this;
         this.$axios
           .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
           .then((response) => {
@@ -572,7 +573,7 @@ export default {
               );
               this.$axios
                 .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",
+                  "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
                   qs.stringify(this.fileQuery)
                 )
                 .then((response) => {

vue/static/config.js

@@ -2,12 +2,17 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-		//ip: 'http://192.168.0.140',
+		// ip: 'http://127.0.0.1', //?? two
-		ip: 'http://127.0.0.1', //?? two
+		// auth_port: '8066',
-		auth_port: '8066',
+		// public_port: '8092',
-		public_port: '8092',
+		// // backend_port: '8092',
-		//backend_port: '8092',
+		// backend_port: '44344', //?? three
-		backend_port: '44344', //?? three
+		
+		ip: localStorage.getItem('config_ip'),
+		auth_port: localStorage.getItem('config_auth_port'),
+		public_port: localStorage.getItem('config_public_port'),
+		backend_port: localStorage.getItem('config_backend_port'),
+		
     },
     basic: {},
     upload: {
@@ -37,16 +42,21 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       
-      //ip: 'http://192.168.0.67',
+			// ip: 'http://192.168.7.21',
-      //ip: 'http://192.168.0.140',
+			// //ip: "http://222.169.228.163",
-      ip: 'http://192.168.0.63',
-      //ip: 'http://149.223.116.5',
-      //ip: 'http://114.116.225.148',
-      //ip: 'http://10.123.148.162',
-      auth_port: '8066',
-      public_port: '8092',
-      backend_port: '8092'
 			
+			// auth_port: '8066',
+			// public_port: '8092',
+			// backend_port: '8092',
+			
+			// // auth_port: "7696",
+			// // public_port: "7692",
+			// // backend_port: "7692",
+			
+			ip: localStorage.getItem('config_ip'),
+			auth_port: localStorage.getItem('config_auth_port'),
+			public_port: localStorage.getItem('config_public_port'),
+			backend_port: localStorage.getItem('config_backend_port'),
     },
     basic: {},
     upload: {