From 8c141a11ae371295f836d7cb12b5f6875cceb501 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 23 Aug 2023 15:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogInvoice.vue  | 120 +++++++++++------------------
 src/views/inout/InvoiceCkeck.vue   |   8 +-
 src/views/inout/InvoiceRegByFp.vue |   2 +-
 3 files changed, 52 insertions(+), 78 deletions(-)

diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue
index ffe8779b..f09baf22 100644
--- a/src/views/inout/DialogInvoice.vue
+++ b/src/views/inout/DialogInvoice.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="inputQuery" :rules="formRules" ref="dataForm">
+    <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px">
       <el-card style="margin-top: -30px">
         <el-button-group style="display: flex">
           <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
@@ -8,98 +8,60 @@
           </el-button>
         </el-button-group>
         <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>规格型号：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="name">
+          <el-col :span="11">
+            <el-form-item  label="规格型号:"  prop="name">
               <el-input v-model="inputQuery.ggxh" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>产品名称：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="code">
+          <el-col :span="11">
+            <el-form-item label="产品名称:"  prop="code">
               <el-input v-model="inputQuery.cpmctymc" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>机械编码：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="name">
+
+          <el-col :span="11">
+            <el-form-item label="机械编码:" prop="name">
               <el-input v-model="inputQuery.machineNo" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>发票代码：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="code">
+          <el-col :span="11">
+            <el-form-item label="发票编码:" prop="invoiceEncode">
               <el-input v-model="inputQuery.invoiceEncode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>发票编码：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="name">
+          <el-col :span="11">
+            <el-form-item label="发票代码:" prop="invoiceCode">
               <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>发票价格：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="code">
+          <el-col :span="11">
+            <el-form-item label="发票价格:" prop="price">
               <el-input v-model="inputQuery.price" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>备注：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="code">
+
+          <el-col :span="11">
+            <el-form-item label="备注:" prop="code">
               <el-input v-model="inputQuery.remark" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>开票日期：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="code">
+          <el-col :span="11">
+            <el-form-item label="开票日期:" prop="invoiceDate">
               <el-date-picker
                 v-model="inputQuery.invoiceDate"
                 type="datetime"
                 placeholder="请选择日期"
                 clearable
                 value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 90%"
+                style="width: 100%"
               >
               </el-date-picker>
             </el-form-item>
@@ -109,13 +71,8 @@
 
 
         <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>文件：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
+          <el-col :span="11">
+            <el-form-item label="文件:">
               <el-upload
                 :disabled="formData.auditStatus == 1"
                 class="upload-demo"
@@ -158,6 +115,7 @@ import draggable from "vuedraggable";
 import store from "@/store";
 import {insertCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert";
 import {updateById} from '@/api/inout/orderDetailBiz'
+import {isBlank} from "@/utils/strUtil";
 
 export default {
   name: "DialogInvoice",
@@ -187,14 +145,17 @@ export default {
         remark:"",
         licenseUrl:""
       },
-      // formRules: {
-      //   name: [
-      //     {required: true, message: "请输入证书名称", trigger: "blur"}
-      //   ],
-      //   code: [
-      //     {required: true, message: "请输入证书编号", trigger: "blur"}
-      //   ],
-      // },
+      formRules: {
+        invoiceCode: [
+          {required: true, message: "请输入发票代码", trigger: "blur"}
+        ],
+        price: [
+          {required: true, message: "请输入发票价格", trigger: "blur"}
+        ],
+        invoiceDate: [
+          {required: true, message: "请输入开票日期", trigger: "blur"}
+        ],
+      },
       loading: false,
       uploadUrl: "",
       fileList: [],
@@ -208,6 +169,19 @@ export default {
   },
   methods: {
     submitUpload() {
+      if(isBlank(this.inputQuery.invoiceCode)){
+        this.$message.error("请输入发票代码!")
+        return;
+      }
+      if(isBlank(this.inputQuery.price)){
+        this.$message.error("请输入发票价格!")
+        return;
+      }
+      if(isBlank(this.inputQuery.invoiceDate)){
+        this.$message.error("请输入开票日期!")
+        return;
+      }
+
       updateById(this.inputQuery).then((res) =>{
           if(res.code==20000){
             this.$message({
diff --git a/src/views/inout/InvoiceCkeck.vue b/src/views/inout/InvoiceCkeck.vue
index 77468e48..60b313fa 100644
--- a/src/views/inout/InvoiceCkeck.vue
+++ b/src/views/inout/InvoiceCkeck.vue
@@ -43,9 +43,9 @@
           </el-col>
 
           <el-col :span="11">
-            <el-form-item label="发票编码:" prop="invoiceCode">
+            <el-form-item label="发票编码:" prop="invoiceEncode">
               <el-input
-                v-model="inputQuery.invoiceCode"
+                v-model="inputQuery.invoiceEncode"
                 auto-complete="off"
               ></el-input>
             </el-form-item>
@@ -53,9 +53,9 @@
         </el-row>
         <el-row>
           <el-col :span="11">
-            <el-form-item label="发票代码:" prop="invoiceEncode">
+            <el-form-item label="发票代码:" prop="invoiceCode">
               <el-input
-                v-model="inputQuery.invoiceEncode"
+                v-model="inputQuery.invoiceCode"
                 auto-complete="off"
               ></el-input>
             </el-form-item>
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 5e81d31b..42855655 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="发票代码:">
-              <el-input v-model="invoiceQuery.invoiceEncode" placeholder="请输入发票代码" style="width: 90%"
+              <el-input v-model="invoiceQuery.invoiceCode" placeholder="请输入发票代码" style="width: 90%"
                         clearable="true"
               ></el-input>
             </el-form-item>