Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue

@@ -612,67 +612,69 @@ export default {
           // this.registProvince = response.data.registAddressProvince
           // this.registcity = response.data.registAddressCity
           // this.registcount = response.data.registAddressCounty
-          const managementcount_codes = this.temp.managementAddressCode.split('')
-          this.managementProvinceCode = managementcount_codes[0] + managementcount_codes[1] + '0000'
-          getProvince().then((res) => {
-            if (res.code === '200') {
-              this.inputProvinceList02 = res.data
-              console.log('回显省02', this.inputProvinceList02)
-              let bb = ''
-              this.inputProvinceList02.forEach((e) => {
-                if (e.districtCode === this.managementProvinceCode) {
-                  bb = {
-                    name: e.name,
-                    districtCode: e.districtCode,
-                    sid: e.sid
+          if (this.temp.managementAddressCode !== '') {
+            const managementcount_codes = this.temp.managementAddressCode.split('')
+            this.managementProvinceCode = managementcount_codes[0] + managementcount_codes[1] + '0000'
+            getProvince().then((res) => {
+              if (res.code === '200') {
+                this.inputProvinceList02 = res.data
+                console.log('回显省02', this.inputProvinceList02)
+                let bb = ''
+                this.inputProvinceList02.forEach((e) => {
+                  if (e.districtCode === this.managementProvinceCode) {
+                    bb = {
+                      name: e.name,
+                      districtCode: e.districtCode,
+                      sid: e.sid
+                    }
                   }
+                })
+                this.managementProvince = bb.name
+                var sid = {
+                  sid: bb.sid
                 }
-              })
-              this.managementProvince = bb.name
-              var sid = {
-                sid: bb.sid
-              }
-              getCity(sid).then((res) => {
-                if (res.code === '200') {
-                  this.inputCityList02 = res.data
-                  console.log('回显市02', this.inputCityList02)
-                  this.managementcityCode = managementcount_codes[0] + managementcount_codes[1] + managementcount_codes[2] + managementcount_codes[3] + '00'
-                  let cc = ''
-                  this.inputCityList02.forEach((e) => {
-                    if (e.districtCode === this.managementcityCode) {
-                      cc = {
-                        name: e.name,
-                        districtCode: e.districtCode,
-                        sid: e.sid
+                getCity(sid).then((res) => {
+                  if (res.code === '200') {
+                    this.inputCityList02 = res.data
+                    console.log('回显市02', this.inputCityList02)
+                    this.managementcityCode = managementcount_codes[0] + managementcount_codes[1] + managementcount_codes[2] + managementcount_codes[3] + '00'
+                    let cc = ''
+                    this.inputCityList02.forEach((e) => {
+                      if (e.districtCode === this.managementcityCode) {
+                        cc = {
+                          name: e.name,
+                          districtCode: e.districtCode,
+                          sid: e.sid
+                        }
                       }
+                    })
+                    this.managementcity = cc.name
+                    var sid02 = {
+                      sid: cc.sid
                     }
-                  })
-                  this.managementcity = cc.name
-                  var sid02 = {
-                    sid: cc.sid
-                  }
-                  getCounty(sid02).then((res) => {
-                    if (res.code === '200') {
-                      this.inputCountyList02 = res.data
-                      console.log('回显市03', this.inputCountyList02)
-                      this.managementcountCode = this.temp.managementAddressCode
-                      let dd = ''
-                      this.inputCountyList02.forEach((e) => {
-                        if (e.districtCode === this.managementcountCode) {
-                          dd = {
-                            name: e.name,
-                            districtCode: e.districtCode,
-                            sid: e.sid
+                    getCounty(sid02).then((res) => {
+                      if (res.code === '200') {
+                        this.inputCountyList02 = res.data
+                        console.log('回显市03', this.inputCountyList02)
+                        this.managementcountCode = this.temp.managementAddressCode
+                        let dd = ''
+                        this.inputCountyList02.forEach((e) => {
+                          if (e.districtCode === this.managementcountCode) {
+                            dd = {
+                              name: e.name,
+                              districtCode: e.districtCode,
+                              sid: e.sid
+                            }
                           }
-                        }
-                      })
-                      this.managementcount = dd.name
-                    }
-                  })
-                }
-              })
-            }
-          })
+                        })
+                        this.managementcount = dd.name
+                      }
+                    })
+                  }
+                })
+              }
+            })
+          }
           this.getLevelList(sids)
         }
       })

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@@ -7,6 +7,8 @@
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
         </el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">确认
+        </el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
     </div>
@@ -170,7 +172,8 @@ export default {
         filePaths: [],
         bitlingFilePaths: [],
         certificatePaths: [],
-        vinNo: ''
+        vinNo: '',
+        tempSave: ''
       },
       rules: {}
     }
@@ -200,6 +203,7 @@ export default {
         if (valid) {
           this.getUrl()
           this.submitdisabled = true
+          this.formobj.tempSave = true
           saveOrUpdate(this.formobj).then((res) => {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '保存成功' })
@@ -213,6 +217,25 @@ export default {
         }
       })
     },
+    handleSubmit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          this.formobj.tempSave = false
+          saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作陈工' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
     getUrl() {
       if (this.diploma_list.length > 0) {
         const aa = []
@@ -241,7 +264,8 @@ export default {
         invoiceNo: '',
         invoiceCode: '',
         filePaths: [],
-        vinNo: ''
+        vinNo: '',
+        tempSave: ''
       }
       this.diploma_list = []
       this.submitdisabled = false

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -41,14 +41,13 @@
               <el-table-column fixed label="操作" align="center" width="180">
                 <template slot-scope="scope">
                   <el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
-                  <el-button type="primary" size="mini" v-show="!scope.row.recallAtn" @click="toEdit(scope.row)">办理</el-button>
                   <el-button type="danger" size="mini" v-show="scope.row.recallAtn" @click="toRevocation(scope.row)">撤回</el-button>
                   <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>
               <el-table-column label="审核状态" align="center" width="90">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '' }}</span>
+                  <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState == 3 ? '已审核' : scope.row.auditState == 4 ? '已撤回' : '' }}</span>
                 </template>
               </el-table-column>
               <el-table-column label="下载次数" align="center" width="90">
@@ -151,8 +150,8 @@
         <el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
       </span>
     </el-dialog>
-    <acknowledgementReceiptAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
-    <acknowledgementReceiptInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
+    <acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
   </div>
 </template>
 
@@ -386,12 +385,8 @@ export default {
         this.visibleDisabled = false
       })
     },
-    toEdit(row) {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit(row)
-    },
     handLook(row) {
-      this.viewState = 4
+      this.viewState = 3
       this.$refs['divInfo'].showInfo(row)
     },
     resetState() {