Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar view-title="出库申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar view-title="出库开票申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <!--Start查询列表部分-->
       <div class="main-content">
         <div class="searchcon">
@@ -33,7 +33,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">出库申请列表</div>
+          <div class="tit">出库开票申请列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue

@@ -11,7 +11,7 @@
         </div>
       </div>
       <div class="listconadd">
-        <div class="titwu">出库申请</div>
+        <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8">
@@ -322,13 +322,13 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.viewTitle = '【新增】出库申请'
+      this.viewTitle = '【新增】出库开票申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.viewTitle = '【编辑】出库申请'
+      this.viewTitle = '【编辑】出库开票申请'
       this.arguments.outboundSid = row.sid
       getRetrievalApplyInfo(this.arguments).then((resp) => {
         if (resp.success) {

anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@@ -2,13 +2,13 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <div class="tab-header webtop">
-        <div>出库申请详情</div>
+        <div>出库开票申请详情</div>
         <div>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
-        <div class="titwu">出库申请</div>
+        <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8" class="tlineheightb">

anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomerAdd.vue

@@ -199,7 +199,7 @@ export default {
     handleSubmit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          if (this.formobj.isGdk === '0' && this.formobj.ssMoney) {
+          if (this.formobj.isGdk === '0' && this.formobj.ssMoney === '') {
             this.$message({ showClose: true, type: 'error', message: '实收手续费不能为空' })
             return
           }

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <div class="tab-header webtop">
-        <div>出库申请详情</div>
+        <div>出库开票申请详情</div>
         <div>
           <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
           <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="">
-        <div class="titwu">出库申请</div>
+        <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8" class="tlineheightb">

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

@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="">
-        <div class="titwu">出库申请</div>
+        <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8">
@@ -331,7 +331,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      this.viewTitle = '【编辑】出库申请'
+      this.viewTitle = '【编辑】出库开票申请'
       this.arguments.outboundSid = sid
       getRetrievalApplyInfo(this.arguments).then((resp) => {
         if (resp.success) {

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

@@ -2,13 +2,13 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <div class="tab-header webtop">
-        <div>出库申请详情</div>
+        <div>出库开票申请详情</div>
         <div>
           <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
         </div>
       </div>
       <div class="">
-        <div class="titwu">出库申请</div>
+        <div class="titwu">出库开票申请</div>
         <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="8" class="tlineheightb">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/jiazhikehubeianFlow/valuablecustomerEdit.vue

@@ -223,6 +223,10 @@ export default {
     handleSubmit() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
+          if (this.formobj.isGdk === '0' && this.formobj.ssMoney === '') {
+            this.$message({ showClose: true, type: 'error', message: '实收手续费不能为空' })
+            return
+          }
           if (this.image_list1.length > 0) {
             const aa = []
             this.image_list1.forEach((e) => {