Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecord.vue

@@ -233,7 +233,7 @@ export default {
         procInsId: row.procInstId,
         token: getStorage()
       }
-      this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
     // 搜索条件效果
     clicksearchShow() {

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@@ -402,6 +402,10 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
+          if (this.formobj.zjApplicationAppendxs.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '请上传证件(营业执照或身份证)的附件' })
+            return
+          }
           this.submitdisabled = true
           save(this.formobj).then((res) => {
             if (res.success) {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@@ -402,6 +402,10 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()
+          if (this.formobj.zjApplicationAppendxs.length === 0) {
+            this.$message({ showClose: true, type: 'error', message: '请上传证件(营业执照或身份证)的附件' })
+            return
+          }
           this.submitdisabled = true
           save(this.formobj).then((res) => {
             if (res.success) {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoInfo.vue

@@ -64,7 +64,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty">单台开票金额</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span><span style="padding-left: 10px;color: red" v-show="formobj.showValueCustomer">价值客户</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">开票类型默认</div>