Ver código fonte

入库、出库、调拨、货转、货物通关明细修改所有主表属性详情截取100

caojunjie 2 anos atrás
pai
commit
2b0fc82d32

+ 42 - 36
src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -2248,12 +2248,13 @@ export default {
           this.form.fProductName = "";
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            arr.push(e.fMarks);
-          });
-          arr = [...new Set(arr)];
-          this.form.fMarks = arr.join(",");
+            let arr = [];
+            this.detailList.map((e) => {
+                arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fMarks = "";
         }
@@ -2357,12 +2358,13 @@ export default {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -2490,12 +2492,13 @@ export default {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -2781,12 +2784,13 @@ export default {
             this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -2880,12 +2884,13 @@ export default {
             this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -3623,12 +3628,13 @@ export default {
           this.form.fProductName = "";
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            arr.push(e.fMarks);
-          });
-          arr = [...new Set(arr)];
-          this.form.fMarks = arr.join(",");
+            let arr = [];
+            this.detailList.map((e) => {
+                arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fMarks = "";
         }

+ 105 - 93
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -2576,16 +2576,17 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }
@@ -2604,12 +2605,13 @@ export default {
           this.form.fProductName = "";
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            arr.push(e.fMarks);
-          });
-          arr = [...new Set(arr)];
-          this.form.fMarks = arr.join(",");
+            let arr = [];
+            this.detailList.map((e) => {
+                arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fMarks = "";
         }
@@ -2669,16 +2671,17 @@ export default {
         }
       }
       if (this.CntrTable.length > 0) {
-        let arr = [];
-        this.CntrTable.map((e) => {
-          this.cntrList.map((item) => {
-            if (item.fId == e.fCntrid) {
-              arr.push(item.fName + "X" + e.fCntrcount);
-            }
+          let arr = [];
+          this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                  if (item.fId == e.fCntrid) {
+                      arr.push(item.fName + "X" + e.fCntrcount);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fCntval = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fCntval = null;
       }
@@ -2697,12 +2700,13 @@ export default {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -2801,16 +2805,17 @@ export default {
         }
       }
       if (this.CntrTable.length > 0) {
-        let arr = [];
-        this.CntrTable.map((e) => {
-          this.cntrList.map((item) => {
-            if (item.fId == e.fCntrid) {
-              arr.push(item.fName + "X" + e.fCntrcount);
-            }
+          let arr = [];
+          this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                  if (item.fId == e.fCntrid) {
+                      arr.push(item.fName + "X" + e.fCntrcount);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fCntval = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fCntval = null;
       }
@@ -2829,12 +2834,13 @@ export default {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -3060,16 +3066,17 @@ export default {
             this.form.fGrossweight = this.fGrossweight;
           }
           if (this.CntrTable.length > 0) {
-            let arr = [];
-            this.CntrTable.map((e) => {
-              this.cntrList.map((item) => {
-                if (item.fId == e.fCntrid) {
-                  arr.push(item.fName + "X" + e.fCntrcount);
-                }
+              let arr = [];
+              this.CntrTable.map((e) => {
+                  this.cntrList.map((item) => {
+                      if (item.fId == e.fCntrid) {
+                          arr.push(item.fName + "X" + e.fCntrcount);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fCntval = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fCntval = null;
           }
@@ -3088,12 +3095,13 @@ export default {
             this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -3157,16 +3165,17 @@ export default {
           // 附件数据
           this.form.fQty = this.fQty;
           if (this.CntrTable.length > 0) {
-            let arr = [];
-            this.CntrTable.map((e) => {
-              this.cntrList.map((item) => {
-                if (item.fId == e.fCntrid) {
-                  arr.push(item.fName + "X" + e.fCntrcount);
-                }
+              let arr = [];
+              this.CntrTable.map((e) => {
+                  this.cntrList.map((item) => {
+                      if (item.fId == e.fCntrid) {
+                          arr.push(item.fName + "X" + e.fCntrcount);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fCntval = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fCntval = null;
           }
@@ -3185,12 +3194,13 @@ export default {
             this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -4142,16 +4152,17 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }
@@ -4202,16 +4213,17 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }

+ 41 - 27
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -7664,12 +7664,14 @@ export default {
               this.form.fProductName = ''
             }
             if (this.detailList.length > 0) {
-              let arr = []
-              this.detailList.map((e) => {
-                arr.push(e.fMarks)
-              })
-              arr = [...new Set(arr)]
-              this.form.fMarks = arr.join(',')
+                let arr = []
+                this.detailList.map((e) => {
+                    arr.push(e.fMarks)
+                })
+                arr = [...new Set(arr)]
+
+                this.form.fMarks = arr.join(',')
+                this.form.fMarks = this.form.fMarks.slice(0, 100)
             } else {
               this.form.fMarks = ''
             }
@@ -7786,7 +7788,9 @@ export default {
               arr.push(e.fMarks)
             })
             arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }
@@ -7907,7 +7911,9 @@ export default {
               arr.push(e.fMarks)
             })
             arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }
@@ -8215,12 +8221,14 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -8325,12 +8333,14 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -8436,12 +8446,14 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -9559,7 +9571,9 @@ export default {
               arr.push(e.fMarks)
             })
             arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }

+ 43 - 36
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -5958,6 +5958,7 @@ export default {
               })
               arr = [...new Set(arr)]
               this.form.fMarks = arr.join(',')
+                this.form.fMarks = this.form.fMarks.slice(0, 100)
             } else {
               this.form.fMarks = ''
             }
@@ -6091,12 +6092,13 @@ export default {
             this.form.fProductName = ''
           }
           if (this.detailList.length > 0) {
-            let arr = []
-            this.detailList.map((e) => {
-              arr.push(e.fMarks)
-            })
-            arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+              let arr = []
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks)
+              })
+              arr = [...new Set(arr)]
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }
@@ -6296,12 +6298,13 @@ export default {
             this.form.fProductName = ''
           }
           if (this.detailList.length > 0) {
-            let arr = []
-            this.detailList.map((e) => {
-              arr.push(e.fMarks)
-            })
-            arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+              let arr = []
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks)
+              })
+              arr = [...new Set(arr)]
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }
@@ -6651,12 +6654,13 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -6816,12 +6820,13 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -6930,12 +6935,13 @@ export default {
                 this.form.fProductName = ''
               }
               if (this.detailList.length > 0) {
-                let arr = []
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks)
-                })
-                arr = [...new Set(arr)]
-                this.form.fMarks = arr.join(',')
+                  let arr = []
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks)
+                  })
+                  arr = [...new Set(arr)]
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100)
               } else {
                 this.form.fMarks = ''
               }
@@ -8241,12 +8247,13 @@ export default {
             this.form.fProductName = ''
           }
           if (this.detailList.length > 0) {
-            let arr = []
-            this.detailList.map((e) => {
-              arr.push(e.fMarks)
-            })
-            arr = [...new Set(arr)]
-            this.form.fMarks = arr.join(',')
+              let arr = []
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks)
+              })
+              arr = [...new Set(arr)]
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100)
           } else {
             this.form.fMarks = ''
           }

+ 254 - 224
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -3338,44 +3338,51 @@ export default {
           surface: "26",
           label: "fLocalcntrno",
           name: "库内箱号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "27",
-          label: "fSealno",
-          name: "封号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "28",
-          label: "fGoodsval",
-          name: "货值",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "29",
-          label: "fSerialNumber",
-          name: "流水号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "30",
-          label: "remark",
-          name: "备注",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "31",
-          label: "fElabel",
-          name: "电子标签",
-          checked: 0,
-          width: 100,
+            checked: 0,
+            width: 100,
         },
+          {
+              surface: "27",
+              label: "fSealno",
+              name: "封号",
+              checked: 0,
+              width: 100,
+          },
+          {
+              surface: "28",
+              label: "fGoodsval",
+              name: "货值",
+              checked: 0,
+              width: 100,
+          },
+          {
+              surface: "29",
+              label: "fSerialNumber",
+              name: "流水号",
+              checked: 0,
+              width: 100,
+          },
+          {
+              surface: "30",
+              label: "remark",
+              name: "备注",
+              checked: 0,
+              width: 100,
+          },
+          {
+              surface: "31",
+              label: "fElabel",
+              name: "电子标签",
+              checked: 0,
+              width: 100,
+          },
+          {
+              surface: "32",
+              label: "fChargedate",
+              name: "计费日期",
+              checked: 0,
+              width: 100,
+          },
       ],
       setRowList: [],
       getRowList: [],
@@ -4201,40 +4208,43 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            this.goodsOptions.map((item) => {
-              if (e.fGoodsid == item.fId) {
-                arr.push(item.fName);
-              }
+            let arr = [];
+            this.detailList.map((e) => {
+                this.goodsOptions.map((item) => {
+                    if (e.fGoodsid == item.fId) {
+                        arr.push(item.fName);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fProductName = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fProductName = "";
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            arr.push(e.fMarks);
-          });
-          arr = [...new Set(arr)];
-          this.form.fMarks = arr.join(",");
+            let arr = [];
+            this.detailList.map((e) => {
+                arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fMarks = "";
         }
@@ -4306,40 +4316,43 @@ export default {
         }
       }
       if (this.CntrTable.length > 0) {
-        let arr = [];
-        this.CntrTable.map((e) => {
-          this.cntrList.map((item) => {
-            if (item.fId == e.fCntrid) {
-              arr.push(item.fName + "X" + e.fCntrcount);
-            }
+          let arr = [];
+          this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                  if (item.fId == e.fCntrid) {
+                      arr.push(item.fName + "X" + e.fCntrcount);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fCntval = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fCntval = null;
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          this.goodsOptions.map((item) => {
-            if (e.fGoodsid == item.fId) {
-              arr.push(item.fName);
-            }
+          let arr = [];
+          this.detailList.map((e) => {
+              this.goodsOptions.map((item) => {
+                  if (e.fGoodsid == item.fId) {
+                      arr.push(item.fName);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fProductName = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -4438,40 +4451,43 @@ export default {
         }
       }
       if (this.CntrTable.length > 0) {
-        let arr = [];
-        this.CntrTable.map((e) => {
-          this.cntrList.map((item) => {
-            if (item.fId == e.fCntrid) {
-              arr.push(item.fName + "X" + e.fCntrcount);
-            }
+          let arr = [];
+          this.CntrTable.map((e) => {
+              this.cntrList.map((item) => {
+                  if (item.fId == e.fCntrid) {
+                      arr.push(item.fName + "X" + e.fCntrcount);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fCntval = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fCntval = null;
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          this.goodsOptions.map((item) => {
-            if (e.fGoodsid == item.fId) {
-              arr.push(item.fName);
-            }
+          let arr = [];
+          this.detailList.map((e) => {
+              this.goodsOptions.map((item) => {
+                  if (e.fGoodsid == item.fId) {
+                      arr.push(item.fName);
+                  }
+              });
           });
-        });
-        arr = [...new Set(arr)];
-        this.form.fProductName = arr.join(",");
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fProductName = "";
       }
       if (this.detailList.length > 0) {
-        let arr = [];
-        this.detailList.map((e) => {
-          arr.push(e.fMarks);
-        });
-        arr = [...new Set(arr)];
-        this.form.fMarks = arr.join(",");
+          let arr = [];
+          this.detailList.map((e) => {
+              arr.push(e.fMarks);
+          });
+          arr = [...new Set(arr)];
+          this.form.fMarks = arr.join(',')
+          this.form.fMarks = this.form.fMarks.slice(0, 100);
       } else {
         this.form.fMarks = "";
       }
@@ -4696,40 +4712,43 @@ export default {
             this.form.fGrossweight = this.fGrossweight;
           }
           if (this.CntrTable.length > 0) {
-            let arr = [];
-            this.CntrTable.map((e) => {
-              this.cntrList.map((item) => {
-                if (item.fId == e.fCntrid) {
-                  arr.push(item.fName + "X" + e.fCntrcount);
-                }
+              let arr = [];
+              this.CntrTable.map((e) => {
+                  this.cntrList.map((item) => {
+                      if (item.fId == e.fCntrid) {
+                          arr.push(item.fName + "X" + e.fCntrcount);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fCntval = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fCntval = null;
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              this.goodsOptions.map((item) => {
-                if (e.fGoodsid == item.fId) {
-                  arr.push(item.fName);
-                }
+              let arr = [];
+              this.detailList.map((e) => {
+                  this.goodsOptions.map((item) => {
+                      if (e.fGoodsid == item.fId) {
+                          arr.push(item.fName);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fProductName = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
-            this.form.fProductName = "";
+              this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -4809,40 +4828,43 @@ export default {
               // 附件数据
               this.form.fQty = this.fQty;
               if (this.CntrTable.length > 0) {
-                let arr = [];
-                this.CntrTable.map((e) => {
-                  this.cntrList.map((item) => {
-                    if (item.fId == e.fCntrid) {
-                      arr.push(item.fName + "X" + e.fCntrcount);
-                    }
+                  let arr = [];
+                  this.CntrTable.map((e) => {
+                      this.cntrList.map((item) => {
+                          if (item.fId == e.fCntrid) {
+                              arr.push(item.fName + "X" + e.fCntrcount);
+                          }
+                      });
                   });
-                });
-                arr = [...new Set(arr)];
-                this.form.fCntval = arr.join(",");
+                  arr = [...new Set(arr)];
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100);
               } else {
                 this.form.fCntval = null;
               }
               if (this.detailList.length > 0) {
-                let arr = [];
-                this.detailList.map((e) => {
-                  this.goodsOptions.map((item) => {
-                    if (e.fGoodsid == item.fId) {
-                      arr.push(item.fName);
-                    }
+                  let arr = [];
+                  this.detailList.map((e) => {
+                      this.goodsOptions.map((item) => {
+                          if (e.fGoodsid == item.fId) {
+                              arr.push(item.fName);
+                          }
+                      });
                   });
-                });
-                arr = [...new Set(arr)];
-                this.form.fProductName = arr.join(",");
+                  arr = [...new Set(arr)];
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100);
               } else {
                 this.form.fProductName = "";
               }
               if (this.detailList.length > 0) {
-                let arr = [];
-                this.detailList.map((e) => {
-                  arr.push(e.fMarks);
-                });
-                arr = [...new Set(arr)];
-                this.form.fMarks = arr.join(",");
+                  let arr = [];
+                  this.detailList.map((e) => {
+                      arr.push(e.fMarks);
+                  });
+                  arr = [...new Set(arr)];
+                  this.form.fMarks = arr.join(',')
+                  this.form.fMarks = this.form.fMarks.slice(0, 100);
               } else {
                 this.form.fMarks = "";
               }
@@ -4954,40 +4976,43 @@ export default {
           // 附件数据
           this.form.fQty = this.fQty;
           if (this.CntrTable.length > 0) {
-            let arr = [];
-            this.CntrTable.map((e) => {
-              this.cntrList.map((item) => {
-                if (item.fId == e.fCntrid) {
-                  arr.push(item.fName + "X" + e.fCntrcount);
-                }
+              let arr = [];
+              this.CntrTable.map((e) => {
+                  this.cntrList.map((item) => {
+                      if (item.fId == e.fCntrid) {
+                          arr.push(item.fName + "X" + e.fCntrcount);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fCntval = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fCntval = null;
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              this.goodsOptions.map((item) => {
-                if (e.fGoodsid == item.fId) {
-                  arr.push(item.fName);
-                }
+              let arr = [];
+              this.detailList.map((e) => {
+                  this.goodsOptions.map((item) => {
+                      if (e.fGoodsid == item.fId) {
+                          arr.push(item.fName);
+                      }
+                  });
               });
-            });
-            arr = [...new Set(arr)];
-            this.form.fProductName = arr.join(",");
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fProductName = "";
           }
           if (this.detailList.length > 0) {
-            let arr = [];
-            this.detailList.map((e) => {
-              arr.push(e.fMarks);
-            });
-            arr = [...new Set(arr)];
-            this.form.fMarks = arr.join(",");
+              let arr = [];
+              this.detailList.map((e) => {
+                  arr.push(e.fMarks);
+              });
+              arr = [...new Set(arr)];
+              this.form.fMarks = arr.join(',')
+              this.form.fMarks = this.form.fMarks.slice(0, 100);
           } else {
             this.form.fMarks = "";
           }
@@ -5900,40 +5925,43 @@ export default {
         "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
       if (status == "zyd") {
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            this.goodsOptions.map((item) => {
-              if (e.fGoodsid == item.fId) {
-                arr.push(item.fName);
-              }
+            let arr = [];
+            this.detailList.map((e) => {
+                this.goodsOptions.map((item) => {
+                    if (e.fGoodsid == item.fId) {
+                        arr.push(item.fName);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fProductName = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fProductName = "";
         }
         if (this.detailList.length > 0) {
-          let arr = [];
-          this.detailList.map((e) => {
-            arr.push(e.fMarks);
-          });
-          arr = [...new Set(arr)];
-          this.form.fMarks = arr.join(",");
+            let arr = [];
+            this.detailList.map((e) => {
+                arr.push(e.fMarks);
+            });
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fMarks = "";
         }
@@ -6188,16 +6216,17 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }
@@ -6248,16 +6277,17 @@ export default {
           }
         }
         if (this.CntrTable.length > 0) {
-          let arr = [];
-          this.CntrTable.map((e) => {
-            this.cntrList.map((item) => {
-              if (item.fId == e.fCntrid) {
-                arr.push(item.fName + "X" + e.fCntrcount);
-              }
+            let arr = [];
+            this.CntrTable.map((e) => {
+                this.cntrList.map((item) => {
+                    if (item.fId == e.fCntrid) {
+                        arr.push(item.fName + "X" + e.fCntrcount);
+                    }
+                });
             });
-          });
-          arr = [...new Set(arr)];
-          this.form.fCntval = arr.join(",");
+            arr = [...new Set(arr)];
+            this.form.fMarks = arr.join(',')
+            this.form.fMarks = this.form.fMarks.slice(0, 100);
         } else {
           this.form.fCntval = null;
         }

+ 3 - 3
vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://58.56.152.118:9010/prod-api/`,
         // target: `http://192.168.0.103:9099/`,
-        // target: `http://192.168.1.111:9010/`,
+        // target: `http://192.168.0.106:9010/`,
         // target: `http://192.168.1.116:9012/`,
         // target: `http://192.168.1.116:9010/`,
         // target: `http://192.168.1.140:9010/`,
@@ -58,10 +58,10 @@ module.exports = {
         // target: `https://hwc.tubaosoft.com/prod-api/`,
         // target: `https://zjxd.dhscs.net/prod-api/`,
         // target: `http://ck.huodaonar.com/prod-api/`,
-        target: `https://ck.hturing.com/prod-api/`,
+        // target: `https://ck.hturing.com/prod-api/`,
         // target: `https://hltd.echepei.com/prod-api/`,
         // target: `https://jingang.re-king.cn//prod-api/`,
-        // target: `https://wms.hadexpress.com/prod-api/`,
+        target: `https://wms.hadexpress.com/prod-api/`,
         // target: `https://jingrun.tubaosoft.com/prod-api/`,
         // target: `https://www.jingruntech.com/prod-api/`,
         // target: `https://ke.khzclogistics.com/prod-api/`,