1

src/components/FinancialModule/RecPayQuery.vue

@@ -592,8 +592,8 @@
               </i>
             </el-tooltip>
               <el-tooltip class="item"
-              v-if="scope.row.KingdeeInvoice>0&&scope.row.KingdeeInvoice!=3&&scope.row.Type==2&&IsUpdatePayment"
-              :content="scope.row.KingdeeInvoice==1?'不需要发票':'需要发票'"
+              v-if="scope.row.KingdeeInvoice!=3&&scope.row.Type==2&&IsUpdatePayment"
+              :content="(scope.row.KingdeeInvoice==1||scope.row.KingdeeInvoice==0)?'不需要发票':'需要发票'"
               placement="top">
                 <i style="width: 30px;
                           height: 30px;
@@ -608,7 +608,7 @@
                           :style="{
                             'background-color':scope.row.KingdeeInvoice!=3?'#47BF8C':'rgba(71,191,140,0.5)'
                           }"
-                          :class="[scope.row.KingdeeInvoice==1?'el-icon-open':'el-icon-turn-off']"
+                          :class="[(scope.row.KingdeeInvoice==1||scope.row.KingdeeInvoice==0)?'el-icon-open':'el-icon-turn-off']"
                           @click="EditInvoiceStatus(scope.row)">
                 </i>
               </el-tooltip>
@@ -1008,7 +1008,7 @@
       // 是否需要发票
       EditInvoiceStatus(row){
         let KingdeeInvoice
-        if(row.KingdeeInvoice==1){
+        if(row.KingdeeInvoice==1||row.KingdeeInvoice==0){
           KingdeeInvoice = 2
         }else if(row.KingdeeInvoice==2){
           KingdeeInvoice = 1

src/components/administrative/empBankAccountAll.vue

@@ -104,6 +104,7 @@
     <div class="empBankAccountTableLayer" v-show="outerVisible">
       <p>
         {{ dialogTitle }}
+        <span style="font-size:12px;color:red;">*如果是个人则无需填写税号，如是供应商则必填税号；</span>
         <span class="fr">
           <button
             class="hollowFixedBtn"
@@ -182,7 +183,7 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item :label="nameC" prop="CardNum">
-              <el-input type="text" v-model="addMsg.CardNum"></el-input>
+              <el-input  type="text" v-model="addMsg.CardNum" onkeyup="value=value.replace(/[^\w\u4E00-\u9FA5]/g, '')" placeholder="卡号请输入中文、数字、字母"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
@@ -230,6 +231,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" :gutter="35">
+						<el-form-item label="税号：" prop="DutyNo" >
+						  <el-input  type="text" v-model="addMsg.DutyNo"></el-input>
+		                </el-form-item>
+					</el-col>
+          <el-col :span="4" :gutter="35">
+						<el-form-item label="供应商：" prop="SupplierName" >
+						  <el-input  type="text" v-model="addMsg.SupplierName"></el-input>
+		                </el-form-item>
+					</el-col>
         </el-row>
       </el-form>
       <div
@@ -526,6 +537,8 @@ export default {
         AccountType: "1",
         AccountClassify: "2",
         Type: "",
+        DutyNo:'',
+        SupplierName:'',
       },
       rules: {
         BankName: [
@@ -835,6 +848,12 @@ export default {
     },
     addData() {
       //添加角色
+      if (this.addMsg.Type!=7&&this.addMsg.Type!=9&&this.addMsg.Type!=10) {
+            if(this.addMsg.DutyNo==''||this.addMsg.DutyNo==undefined){
+              this.$message.error('请填写税号')
+              return
+            }
+          }
       if(this.$route.query.id) this.addMsg.ObjID = this.$route.query.id;
       if(this.supplierMsg.Type==10) this.addMsg.ObjID = this.addMsg.CreateBy
       if (
@@ -862,6 +881,7 @@ export default {
         this.$message.error(this.$t("visaT.Pleasefillin") + this.nameE);
         return;
       }
+
       // 查询是否有冲突的账户信息
       this.checkCanAdd();
     },
@@ -884,23 +904,25 @@ export default {
       );
     },
     checkCanAdd() {
-      this.apipost(
-        "admin_post_GetBackAccount",
-        { RB_Group_Id: this.addMsg.ObjID, ...this.addMsg },
-        (res) => {
-          if (res.data.resultCode == 1) {
-            if (res.data.data && res.data.data.length) {
-              this.accountList = res.data.data;
-            } else {
-              this.addAccount();
-            }
-          } else {
-            this.$message.error(res.data.message);
-          }
-        },
-        (err) => {}
-      );
-    },
+        this.$confirm("客户类型与税号请务必填写正确，避免单据驳回！！", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.apipost('admin_post_GetBackAccount',{RB_Group_Id: this.addMsg.ObjID, ...this.addMsg},res=>{
+					if(res.data.resultCode==1){
+						if(res.data.data && res.data.data.length) {
+							this.accountList = res.data.data
+						} else {
+						this.addAccount()
+						}
+					}else{
+						this.$message.error(res.data.message)}
+				},err=>{})
+          })
+          .catch(() => {});
+				},
     updateData(id) {
       //修改角色
       this.apipost(