前端代码合并提交

src/views/customer/customerComPanyDetail.vue

@@ -65,10 +65,12 @@
             label="状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.status == 1" style="color:green">变更经办人成功</span>
-              <span v-else-if="scope.row.status == 2" style="color: red">待输入验证码</span>
-              <span v-else-if="scope.row.status == 3" style="color: blue">开票经办人上传成功</span>
+               <span v-if="scope.row.status == 1" style="color:green">变更经办人短信确认成功</span>
+              <span v-else-if="scope.row.status == 2" style="color: red">变更经办人发送短信</span>
+              <span v-else-if="scope.row.status == 3" style="color: blue">经办人提交成功</span>
               <span v-else-if="scope.row.status == 4" style="color: cyan">证明附件上传成功</span>
+              <span v-else-if="scope.row.status == 5" style="color: cyan">开票经办人短信发送</span>
+              <span v-else-if="scope.row.status == 6" style="color: cyan">开票经办人认证成功</span>
             </template>
           </el-table-column>
           <el-table-column

src/views/platform/check/customerComPanyDetailCust.vue

@@ -57,17 +57,26 @@
             label="状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.status == 1" style="color:green">变更经办人成功</span>
-              <span v-else-if="scope.row.status == 2" style="color: red">待输入验证码</span>
-              <span v-else-if="scope.row.status == 3" style="color: blue">开票经办人上传成功</span>
+              <span v-if="scope.row.status == 1" style="color:green">变更经办人短信确认成功</span>
+              <span v-else-if="scope.row.status == 2" style="color: red">变更经办人发送短信</span>
+              <span v-else-if="scope.row.status == 3" style="color: blue">经办人提交成功</span>
               <span v-else-if="scope.row.status == 4" style="color: cyan">证明附件上传成功</span>
+              <span v-else-if="scope.row.status == 5" style="color: cyan">开票经办人短信发送</span>
+              <span v-else-if="scope.row.status == 6" style="color: cyan">开票经办人认证成功</span>
             </template>
           </el-table-column>
           <el-table-column
+            label="开票短信确认时间"
+            prop="lastTime"
+            width="180"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
             label="操作"
-            width="280">
+            width="380">
             <template slot-scope="scope" show-overflow-tooltip>
               <el-button type="button" size="mini" style="cursor:pointer" @click="sendCode(scope.row)">发送开票验证码</el-button>
+              <el-button type="button" size="mini" style="cursor:pointer" @click="openConfirm(scope.row)">回填开票验证码</el-button>
               <el-button type="button" size="mini" style="cursor:pointer" @click="openChange(scope.row)">变更经办人</el-button>
             </template>
           </el-table-column>
@@ -94,20 +103,28 @@
         <div class="line"></div>
         <el-form
           label-position="right"
-          label-width="120px"
+          label-width="130px"
           :rules="rules"
           ref="ruleForm"
           :model="formOperatorList">
-         <el-form-item label="经办人姓名" prop="operatorName">
-            <el-input v-model="formOperatorList.operatorName" auto-complete="off" placeholder="请输入经办人姓名"></el-input>
+         <el-form-item label="原经办人姓名" prop="operatorName">
+            <el-input v-model="formOperatorList.operatorName" auto-complete="off" disabled placeholder="请输入经办人姓名"></el-input>
+          </el-form-item>
+
+         <el-form-item label="原经办人手机号" prop="operatorMobile">
+            <el-input v-model="formOperatorList.operatorMobile" auto-complete="off" disabled placeholder="请输入经办人手机号"></el-input>
           </el-form-item>
 
-         <el-form-item label="经办人手机号" prop="operatorMobile">
-            <el-input v-model="formOperatorList.operatorMobile" auto-complete="off" placeholder="请输入经办人手机号"></el-input>
+          <el-form-item label="新经办人姓名" prop="tOperatorName">
+            <el-input v-model="formOperatorList.tOperatorName" auto-complete="off" placeholder="请输入新经办人姓名"></el-input>
           </el-form-item>
 
-         <el-form-item label="经办人身份证" prop="identificationId">
-            <el-input v-model="formOperatorList.identificationId" auto-complete="off" placeholder="请输入经办人身份证"></el-input>
+         <el-form-item label="新经办人手机号" prop="tOperatorMobile">
+            <el-input v-model="formOperatorList.tOperatorMobile" auto-complete="off" placeholder="请输入新经办人手机号"></el-input>
+          </el-form-item>
+
+         <el-form-item label="新经办人身份证" prop="tIdentificationId">
+            <el-input v-model="formOperatorList.tIdentificationId" auto-complete="off" placeholder="请输入新经办人身份证"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -117,7 +134,7 @@
       </el-dialog>
       <!-- 验证码输入 -->
       <el-dialog
-        @close="this.vilidateForm.validCode = ''"
+        @close="vilidateForm.validCode = ''"
         :visible.sync="vlidateCodeClose"
         style="font-size: 0px;">
         <div class="tou">验证码输入</div>
@@ -129,7 +146,7 @@
           ref="ruleForm1"
           :model="vilidateForm">
          <el-form-item label="验证码" prop="validCode">
-            <el-input v-model="vilidateForm.validCode" auto-complete="off" placeholder="请输入验证码"></el-input>
+            <el-input v-model="vilidateForm.validCode" auto-complete="off" placeholder="系统已向现经办人手机号码发送验证码，请注意查收输入"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -138,7 +155,7 @@
       </el-dialog>
        <!-- 验证码输入 -->
       <el-dialog
-        @close="this.carVilidateForm.validCode = ''"
+        @close="carVilidateForm.validCode = ''"
         :visible.sync="carVilidateCodeClose"
         style="font-size: 0px;">
         <div class="tou">运单开票验证码输入</div>
@@ -170,11 +187,11 @@ export default{
       loading: true,
       customerCompanytable: [],
       rules: {
-       operatorName: [
+       tOperatorName: [
           { required: true, message: `请输入经办人姓名`, trigger: `blur` },
           { min: 2, max: 15, message: `长度在 2 到 15 个字符`, trigger: `blur` }
         ],
-        operatorMobile: [
+        tOperatorMobile: [
           { required: true, message: `请输入经办人手机号`, trigger: `blur` },
           { min: 11, max: 11, message: `长度在 11 个字符`, trigger: `blur` }
         ]
@@ -192,7 +209,10 @@ export default{
         'companyNum': ``,
         'operatorName': ``,
         'operatorMobile': ``,
-        'identificationId': ``
+        'identificationId': ``,
+        'tOperatorName': ``,
+        'tOperatorMobile': ``,
+        'tIdentificationId': ``
       },
       vilidateForm: {
         'companyNum': '',
@@ -283,7 +303,7 @@ export default{
         }
       })
     },
-    // 新增用户
+    //修改用户
     updateData(formName) {
       this.$refs[formName].validate(async(valid) => {
         if (valid) {
@@ -296,16 +316,17 @@ export default{
            const param = {
               companyNum: this.formOperatorList['companyNum'],
               sourceOperatorMobile: this.orgRow['operatorMobile'],
-              targetOperatorName: this.formOperatorList['operatorName'],
-              targetIdentificationId: this.formOperatorList['identificationId'],
-              targetOperatorMobile: this.formOperatorList['operatorMobile']
+              targetOperatorName: this.formOperatorList['tOperatorName'],
+              targetIdentificationId: this.formOperatorList['tIdentificationId'],
+              targetOperatorMobile: this.formOperatorList['tOperatorMobile']
            };
           const response = await this.$http.post(`customerCompany/updateNoCarCompanyManger`, param)
           if (response.data.code == 0) {
+             this.loadData();
             loading.close();
             this.updateOperatorList = false;
             this.vilidateForm.companyNum = this.formOperatorList['companyNum']
-            this.vilidateForm.targetOperatorMobile = this.formOperatorList['operatorMobile']
+            this.vilidateForm.targetOperatorMobile = this.formOperatorList['tOperatorMobile']
              this.vlidateCodeClose = true;
           } else {
           loading.close();
@@ -338,9 +359,12 @@ export default{
            });
           const response = await this.$http.post(`customerCompany/sendCode`, sendParam)
           if (response.data.code == 0) {
+             this.loadData();
             loading.close();
-            this.carVilidateCodeClose = true;
-            this.carVilidateForm['buyerCode'] = recoder['companyNum'];
+           this.$message({
+                         type: 'success',
+                         message: '验证码已发送，请您注意查收'
+                       });
           } else {
             loading.close();
             this.$message({
@@ -349,6 +373,10 @@ export default{
             })
           }
     },
+    openConfirm(recoder){
+      this.carVilidateCodeClose = true;
+      this.carVilidateForm['buyerCode'] = recoder['companyNum'];
+    },
      confirmVilidate(formName){
       this.$refs[formName].validate(async(valid) => {
         if (valid) {
@@ -363,6 +391,7 @@ export default{
             loading.close();
             this.carVilidateCodeClose = false;
             this.carVilidateForm.validCode = ''
+             this.loadData();
             this.$message({
                          type: 'success',
                          message: '运单开票短信确认成功'