Merge branch 'FoShanPG' of http://dev.ccwin-in.com:3000/PG/Win.Sfs.SmartSettlementSystem.PG into FoShanPG

vue/src/router/index.js

@@ -70,6 +70,9 @@ export const constantRoutes = [
 	//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
 	// component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
 	//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',

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

@@ -43,14 +43,13 @@
           </el-select>
         </el-form-item>
 				
-          <el-form-item label="大众工位" prop="fwStation">
+          <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"
-              @change="ptypeselectChange"
             >
               <el-option
                 v-for="item in fwStationList"
@@ -833,6 +832,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },

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

@@ -312,7 +312,7 @@ export default {
       customerInfo: {
         printType: "1",
         productLine: "",
-		fwStation: ""
+        fwStation: ""
       },
       // 高级搜索
       filterObj: {
@@ -417,7 +417,7 @@ export default {
     getDefaultField() {
       var tempsTabs = [];
       tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      //tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
       tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
       tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
       tempsTabs.push({

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

@@ -218,7 +218,7 @@ export default {
       customerInfo: {
         printType: "",
         productLine: "",
-		fwStation: ""
+        fwStation: ""
       },
       // 高级搜索
       filterObj: {
@@ -567,6 +567,7 @@ export default {
 		debugger
 		//门板
 		//传递大众顺序号起止
+		let _this = this;
 		this.$axios
 		  .posts(
 			"/api/newjit/bill-m100/save-zhuhuban-report",
@@ -611,12 +612,14 @@ export default {
 							  this.fileQuery.dataname = JSON.stringify(
 								response.item
 							  );
+								
 							  //this.fileQuery.dataname = "";
 							  console.log("打印json");
 							  console.log(this.fileQuery.dataname);
 							  this.$axios
 								.posts(
-								  "/Handlers/Handler1.ashx?report=zhuhuban",
+								  //"/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/detail.vue

@@ -148,6 +148,7 @@ export default {
       searchContent: "", // 输入内容
       customerInfo: {
         parentId: "",
+		billId: ""
       },
       form: {
         dicDetailID: "",
@@ -201,11 +202,13 @@ export default {
   watch: {
     customerInfos: {
       handler(newVal) {
+				debugger
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
           newVal.forEach((element) => {
             this.customerInfo.parentId = element.ParentId;
+			this.customerInfo.billId = element.BillId;
           });
           if (this.customerInfo.parentId != "") {
             this.getList();
@@ -270,7 +273,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/m100Online/index-old.vue

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

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

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

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

@@ -1,4 +1,5 @@
 <!--日常打印M100信息模块-->
+<!--日常打印M100信息模块-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -813,7 +814,7 @@ export default {
                 if (JKITEM.productLine == "01") {
                   this.$refs.sp01.Visible = true;
                   this.content01 =
-                    "01生产线已经" +
+                    "大众一厂已经" +
                     JKITEM.timeoutMinutes +
                     "分钟没收到报文\xa0\xa0\xa0\xa0";
                   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
@@ -830,7 +831,7 @@ export default {
                 if (JKITEM.productLine == "02") {
                   this.$refs.sp05.Visible = true;
                   this.content05 =
-                    "02生产线已经" +
+                    "大众二厂已经" +
                     JKITEM.timeoutMinutes +
                     "分钟没收到报文\xa0\xa0\xa0\xa0";
                   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
@@ -1020,6 +1021,7 @@ export default {
     },
     //抽屉
     handleDrawerOpen(param) {
+		debugger
       this.drawer = true;
       //console.log(510)
       //console.log(param)
@@ -1027,9 +1029,11 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+		  BillId: param.id
         },
       ];
     },
+		
     handleDrawerClose(done) {
       done();
     },
@@ -1247,7 +1251,7 @@ export default {
           {
             PrintType: 1,
             ProductLine: val,
-			fwStation: this.listQuery.fwStation
+            fwStation: this.listQuery.fwStation
           },
         ];
       }
@@ -1551,8 +1555,7 @@ export default {
                 //门板
                 if (
                   parseInt(this.form.endHostSN) -
-                    parseInt(this.form.beginHostSN) <=
+                    parseInt(this.form.beginHostSN) < 0
-                  0
                 ) {
                   this.$message({
                     message: "起止大众顺序号相减不能为零！",

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/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

@@ -635,12 +635,12 @@ export default {
       });
       tempsTabs.push({
         label: "柱护板状态BA2",
-        prop: "BA2",
+        prop: "bA2",
         width: 120,
       });
       tempsTabs.push({
         label: "柱护板状态BA5",
-        prop: "BA5",
+        prop: "bA5",
         width: 120,
       });
       tempsTabs.push({
@@ -677,6 +677,7 @@ export default {
       this.customerInfos = [
         {
           ParentId: parentId,
+					BillId: param.id
         },
       ];
     },
@@ -802,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) {