From 5000ad82b4d7e1fbb37d460eee9ca7ad7ee3e3fb Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 6 Jul 2022 23:31:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessTypeThirdModify.vue  |  4 +-
 src/views/thrsys/ThrInvWarehouse.vue          |  4 +-
 src/views/thrsys/ThrProductsAdd.vue           | 30 ++++-----
 .../userManage/param/systemPDFModule.vue      | 67 +++----------------
 src/views/warehouse/addHosOrder.vue           |  9 ++-
 src/views/warehouse/addOrder.vue              |  9 ++-
 src/views/warehouse/editCode.vue              |  1 +
 7 files changed, 43 insertions(+), 81 deletions(-)

diff --git a/src/views/basic/BussinessTypeThirdModify.vue b/src/views/basic/BussinessTypeThirdModify.vue
index aed48cc..b08ec6d 100644
--- a/src/views/basic/BussinessTypeThirdModify.vue
+++ b/src/views/basic/BussinessTypeThirdModify.vue
@@ -11,7 +11,7 @@
                         size="small"
                         splaceholder="请输入内容"
                         :disabled="!isAdd"
-                        v-model="inputQuery.name"
+                        v-model.trim="inputQuery.name"
                     ></el-input>
                 </div>
             </el-col>
@@ -25,7 +25,7 @@
                         :disabled="!isAdd"
                         size="small"
                         splaceholder="请输入内容"
-                        v-model="inputQuery.action"
+                        v-model.trim="inputQuery.action"
                     ></el-input>
                 </div>
             </el-col>
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 948f3f2..8ecbae7 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -128,13 +128,13 @@
 
                 <el-form-item label="仓库编码" prop="title" class="query-form-item">
                     <el-input
-                        v-model="formData.code" style="width: 80%"
+                        v-model.trim="formData.code" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
                 <el-form-item label="仓库名称" prop="name" class="query-form-item">
                     <el-input
-                        v-model="formData.name" style="width: 80%"
+                        v-model.trim="formData.name" style="width: 80%"
                         auto-complete="off"
                     ></el-input>
                 </el-form-item>
diff --git a/src/views/thrsys/ThrProductsAdd.vue b/src/views/thrsys/ThrProductsAdd.vue
index b6a67eb..b5620d7 100644
--- a/src/views/thrsys/ThrProductsAdd.vue
+++ b/src/views/thrsys/ThrProductsAdd.vue
@@ -41,7 +41,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.code"
+                                v-model.trim="newProductData.code"
                             ></el-input>
                         </div>
                     </el-col>
@@ -54,7 +54,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.name"
+                                v-model.trim="newProductData.name"
                             ></el-input>
                         </div>
                     </el-col>
@@ -72,7 +72,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.spec"
+                                v-model.trim="newProductData.spec"
                             ></el-input>
                         </div>
                     </el-col>
@@ -86,7 +86,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.measname"
+                                v-model.trim="newProductData.measname"
                             ></el-input>
                         </div>
                     </el-col>
@@ -104,7 +104,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.manufactory"
+                                v-model.trim="newProductData.manufactory"
                             ></el-input>
                         </div>
                     </el-col>
@@ -117,7 +117,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.registerNo"
+                                v-model.trim="newProductData.registerNo"
                             ></el-input>
                         </div>
                     </el-col>
@@ -133,7 +133,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ylqxzcrbarmc"
+                                v-model.trim="newProductData.ylqxzcrbarmc"
                             ></el-input>
                         </div>
                     </el-col>
@@ -146,7 +146,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ylqxzcrbarywmc"
+                                v-model.trim="newProductData.ylqxzcrbarywmc"
                             ></el-input>
                         </div>
                     </el-col>
@@ -162,7 +162,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.cplb"
+                                v-model.trim="newProductData.cplb"
                             ></el-input>
                         </div>
                     </el-col>
@@ -175,7 +175,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.flbm"
+                                v-model.trim="newProductData.flbm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -192,7 +192,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.sptm"
+                                v-model.trim="newProductData.sptm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -205,7 +205,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.ybbm"
+                                v-model.trim="newProductData.ybbm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -221,7 +221,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.tyshxydm"
+                                v-model.trim="newProductData.tyshxydm"
                             ></el-input>
                         </div>
                     </el-col>
@@ -234,7 +234,7 @@
                                 style="width: 60%"
                                 size="small"
                                 placeholder="请输入内容"
-                                v-model="newProductData.qxlb"
+                                v-model.trim="newProductData.qxlb"
                             ></el-input>
                         </div>
                     </el-col>
@@ -254,7 +254,7 @@
                                 size="mini"
                                 rows="4"
                                 placeholder="请输入内容"
-                                v-model="newProductData.cpms"
+                                v-model.trim="newProductData.cpms"
                             ></el-input>
                         </div>
                     </el-col>
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index 2251986..3f5006e 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -120,6 +120,14 @@
                         </p>
                     </template>
                 </el-table-column>
+                <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">
+                    <template slot-scope="scope">
+                        <el-select v-model="scope.row.printType" placeholder="打印方式">
+                            <el-option label="批次号" :value=0></el-option>
+                            <el-option label="条码清单" :value=1></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
                 <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
@@ -200,71 +208,12 @@
         >
             <el-form :model="formData" :rules="formRules" ref="dataForm">
 
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="2">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>模板名称：</span>-->
-                <!--                        </div>-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>模板名称：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="8">-->
-                <!--                        <el-form-item prop="name">-->
-                <!--                            <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                        <el-form-item label="所属模块" prop="type">-->
-                <!--                            <el-select v-model="formData.type" placeholder="所属模块">-->
-                <!--                                <el-option label="订单详情" value="1"></el-option>-->
-                <!--                            </el-select>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="2">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>备注：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="8">-->
-                <!--                        <el-form-item prop="type">-->
-                <!--                            <el-input type="textarea" v-model="formData.remark" rows=6></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                </el-row>-->
-
                 <el-form-item label="模板名称" prop="name">
                     <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
                 </el-form-item>
                 <el-form-item label="备注">
                     <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
                 </el-form-item>
-                <!--                <el-form-item label="所属模块" prop="type">-->
-                <!--                    <el-select v-model="formData.type" placeholder="所属模块">-->
-                <!--                        <el-option label="订单详情" value="1"></el-option>-->
-                <!--                    </el-select>-->
-                <!--                </el-form-item>-->
-
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="2">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>表格行数：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="8">-->
-                <!--                        <el-form-item prop="uploadUrl">-->
-                <!--                            <el-input-number v-model="formData.rowCount" :min="1" :max="30" label=""></el-input-number>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="2">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>二维码数量：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="8">-->
-                <!--                        <el-form-item prop="uploadUrl">-->
-                <!--                            <el-input-number v-model="formData.qrcodeCount" :min="1" :max="100" label=""></el-input-number>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                </el-row>-->
 
                 <el-row :gutter="20">
                     <el-col :span="4">
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index dc97a9a..d59da94 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -213,11 +213,9 @@
                         >出入库必须校验预验收库
                         </el-checkbox>
                         <el-checkbox v-model="formData.vailInv"
-                                     :disabled="corpOrderIdDisabled"
                         >是否查询库存
                         </el-checkbox>
                         <el-checkbox v-model="formData.codeFillCheck"
-                                     :disabled="corpOrderIdDisabled"
                         >采集UDI码时进行三期校验
                         </el-checkbox>
                     </div>
@@ -479,6 +477,8 @@ export default {
                 invWarehouseCode: null,
                 subInvCode: null,
                 fromSubInvCode: null,
+                codeFillCheck: null,
+                vailInv: null,
 
             },
             editOriginCodeVisible: false,
@@ -871,6 +871,11 @@ export default {
                     this.busTypes = response.data.list || [];
                     if (this.formData.action != null) {
                         this.curAction = this.getActionItem(this.formData.action);
+                        if (this.curAction != null) {
+                            this.formData.vailInv = this.curAction.vailInv;
+                            this.formData.codeFillCheck = this.curAction.codeFillCheck;
+                        }
+
                     }
                 })
                 .catch(() => {
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 9df1300..f7ea5c4 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -134,7 +134,6 @@
                     <el-col :span="12" class="el-col">
                         <div class="text item">
                             <el-checkbox v-model="formData.codeFillCheck"
-                                         :disabled="corpOrderIdDisabled"
                             >采集UDI码时进行三期校验
                             </el-checkbox>
                         </div>
@@ -376,6 +375,10 @@ export default {
                 expireDate: null,
                 serialNo: null,
                 count: null,
+                codeFillCheck: null,
+                vailInv: null,
+                subInvCode: null,
+                fromSubInvCode: null,
             },
             formRules: {
                 temp: [
@@ -760,6 +763,10 @@ export default {
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                     this.curAction = this.busTypes[0];
+                    if (this.curAction != null) {
+                        this.formData.vailInv = this.curAction.vailInv;
+                        this.formData.codeFillCheck = this.curAction.codeFillCheck;
+                    }
                     this.getStorage(this.formData.billType);
                     // this.getList();
                 })
diff --git a/src/views/warehouse/editCode.vue b/src/views/warehouse/editCode.vue
index 9436bb4..d940b70 100644
--- a/src/views/warehouse/editCode.vue
+++ b/src/views/warehouse/editCode.vue
@@ -79,6 +79,7 @@
                     <el-form-item prop="count">
                         <el-input v-model="editData.count" auto-complete="off"
                                   type="number"
+                                  min="1"
                                   :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
                     </el-form-item>
                 </el-col>