Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@@ -75,7 +75,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
                 <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@@ -83,8 +83,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item>
+            <el-col :span="4">
+              <el-form-item style="text-align: right">
                 <el-button type="primary" size="small" @click="handlePreserve">维护开票信息</el-button>
               </el-form-item>
             </el-col>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/weihukaipiaoxinxi.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="18">
               <el-form-item>
-                <el-radio-group :disabled="print != ''" v-model="print">
+                <el-radio-group :disabled="formobj.sid !== '' && print != ''" v-model="print">
                   <el-radio label="1">企业</el-radio>
                   <el-radio label="0">个人</el-radio>
                 </el-radio-group>
@@ -31,7 +31,9 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6"></el-col>
+            <el-col :span="6" class="tleftb">
+              <span>可检索开票名称</span>
+            </el-col>
             <el-col :span="18">
               <el-form-item>
                 <el-select v-model="nameAndPhone" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@@ -42,52 +44,52 @@
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>开票名称</span>
+              <span><span class="icon">*</span>开票名称</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>纳税人识别号</span>
+              <span><span class="icon">*</span>纳税人识别号</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>电话</span>
+              <span><span class="icon">*</span>电话</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-show="print == '1'">
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>地址</span>
+              <span><span class="icon">*</span>地址</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              <el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
-          <el-row v-show="print == '1'">
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>开户行</span>
+              <span><span class="icon">*</span>开户行</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item>
+              <el-form-item prop="bankName">
                 <el-input v-model="formobj.bankName" clearable placeholder="" style="width: 30%"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-show="print == '1'">
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>银行账号</span>
+              <span><span class="icon">*</span>银行账号</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -127,7 +129,14 @@ export default {
         staffSid: '',
         createBySid: ''
       },
-      rules: {},
+      rules: {
+        name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
+        taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
+        phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
+        address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+        bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
+        bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
+      },
       submitdisabled: false
     }
   },
@@ -148,7 +157,7 @@ export default {
       selectAllDisList({ orgSid: useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
         if (resp.success) {
           this.openTick_list = resp.data
-          if (name !== null && name !== '') {
+          if (name !== null && name !== '' && name !== undefined) {
             this.changeOpenTick(name)
             if (this.formobj.bankAccount !== '') {
               this.print = '1'
@@ -178,6 +187,11 @@ export default {
       this.formobj.bankAccount = choose[0].invoBankNum
       this.formobj.sid = choose[0].sid
       this.nameAndPhone = choose[0].name
+      if (this.formobj.bankAccount !== '') {
+        this.print = '1'
+      } else {
+        this.print = '0'
+      }
     },
     add() {
       this.formobj.sid = ''
@@ -193,6 +207,10 @@ export default {
     save() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.print === '') {
+            this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
+            return
+          }
           this.submitdisabled = true
           if (this.print === '1') {
             save(this.formobj).then((resp) => {

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@@ -74,7 +74,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <div class="span-sty">开票名称默认</div>
               <el-form-item>
                 <el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@@ -82,7 +82,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <el-form-item>
                 <el-button type="primary" size="small" @click="handlePreserve">维护开票信息</el-button>
               </el-form-item>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue

@@ -23,7 +23,7 @@
             </el-col>
             <el-col :span="18">
               <el-form-item>
-                <el-radio-group :disabled="print != ''" v-model="print">
+                <el-radio-group :disabled="formobj.sid !== '' && print != ''" v-model="print">
                   <el-radio label="1">企业</el-radio>
                   <el-radio label="0">个人</el-radio>
                 </el-radio-group>
@@ -31,7 +31,9 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6"></el-col>
+            <el-col :span="6" class="tleftb">
+              <span>可检索开票名称</span>
+            </el-col>
             <el-col :span="18">
               <el-form-item>
                 <el-select v-model="nameAndPhone" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@@ -42,52 +44,52 @@
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>开票名称</span>
+              <span><span class="icon">*</span>开票名称</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>纳税人识别号</span>
+              <span><span class="icon">*</span>纳税人识别号</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6" class="tleftb">
-              <span>电话</span>
+              <span><span class="icon">*</span>电话</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>地址</span>
+              <span><span class="icon">*</span>地址</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
+              <el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>开户行</span>
+              <span><span class="icon">*</span>开户行</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item>
+              <el-form-item prop="bankName">
                 <el-input v-model="formobj.bankName" clearable placeholder="" style="width: 30%"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="print == '1'">
             <el-col :span="6" class="tleftb">
-              <span>银行账号</span>
+              <span><span class="icon">*</span>银行账号</span>
             </el-col>
             <el-col :span="18">
-              <el-form-item><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
+              <el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -124,9 +126,17 @@ export default {
         useOrgName: '',
         useOrgSid: '',
         orgSidPath: '',
+        staffSid: '',
         createBySid: ''
       },
-      rules: {},
+      rules: {
+        name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
+        taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
+        phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
+        address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+        bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
+        bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
+      },
       submitdisabled: false
     }
   },
@@ -147,7 +157,7 @@ export default {
       selectAllDisList({ orgSid: useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
         if (resp.success) {
           this.openTick_list = resp.data
-          if (name !== null && name !== '') {
+          if (name !== null && name !== '' && name !== undefined) {
             this.changeOpenTick(name)
             if (this.formobj.bankAccount !== '') {
               this.print = '1'
@@ -159,6 +169,7 @@ export default {
       })
       this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
       this.formobj.useOrgSid = useOrgSid
       fetchBySid(useOrgSid).then((resp) => {
         if (resp.success) {
@@ -176,6 +187,11 @@ export default {
       this.formobj.bankAccount = choose[0].invoBankNum
       this.formobj.sid = choose[0].sid
       this.nameAndPhone = choose[0].name
+      if (this.formobj.bankAccount !== '') {
+        this.print = '1'
+      } else {
+        this.print = '0'
+      }
     },
     add() {
       this.formobj.sid = ''
@@ -191,6 +207,10 @@ export default {
     save() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.print === '') {
+            this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
+            return
+          }
           this.submitdisabled = true
           if (this.print === '1') {
             save(this.formobj).then((resp) => {
@@ -235,6 +255,7 @@ export default {
         useOrgName: '',
         useOrgSid: '',
         orgSidPath: '',
+        staffSid: '',
         createBySid: ''
       }
       this.submitdisabled = false