待办调转

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -60,7 +60,7 @@
           </el-col> -->
           <el-col :span="12" v-if="SupplierTypeCode == '02' && Title == '新增准入范围'">
             <el-form-item label="名称" required>
-              <el-input placeholder="请选择名称" v-model="BusinessForm.Name" style="width:100%" disabled>
+              <el-input placeholder="请选择名称" v-model="BusinessForm.Name" style="width:100%" readonly>
                 <el-button type="primary" style="width:30%" @click="basicDialog = true" slot="append">选择
                 </el-button>
               </el-input>
@@ -79,7 +79,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="编码" required>
-              <el-input v-model="BusinessForm.Code" placeholder="请输入编码" :disabled="Title == '编辑准入范围'"></el-input>
+              <el-input v-model="BusinessForm.Code" placeholder="请输入编码" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -1632,15 +1632,16 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         }
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.getEntityById()
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
-            this.dialogVisible = false
+            // this.getEntityById()
+            // this.dialogMakeSure = false
+            // this.dialogAllocation = false
+            // this.dialogMakeSure2 = false
+            // this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -1711,15 +1711,16 @@
         }
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.getEntityById()
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
-            this.dialogVisible = false
+            // this.getEntityById()
+            // this.dialogMakeSure = false
+            // this.dialogAllocation = false
+            // this.dialogMakeSure2 = false
+            // this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -1635,15 +1635,16 @@
         }
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.getEntityById()
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
-            this.dialogVisible = false
+            // this.getEntityById()
+            // this.dialogMakeSure = false
+            // this.dialogAllocation = false
+            // this.dialogMakeSure2 = false
+            // this.dialogVisible = false
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -38,7 +38,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
                      v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
-            提交分办</el-button>
+            提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -921,14 +921,10 @@
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
 
@@ -1272,11 +1268,10 @@
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
@@ -2037,10 +2032,11 @@
                 type: 'success',
                 message: res.data.message
               })
-              this.getannualdata()
-              this.dialogMakeSure = false
-              this.dialogProfAudit = false
-              this.addshow = false
+              // this.getannualdata()
+              // this.dialogMakeSure = false
+              // this.dialogProfAudit = false
+              // this.addshow = false
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -38,7 +38,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
                      v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
-            提交分办</el-button>
+            提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -842,14 +842,10 @@
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
 
@@ -1201,11 +1197,10 @@
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
@@ -1969,10 +1964,11 @@
                 type: 'success',
                 message: res.data.message
               })
-              this.getannualdata()
-              this.dialogMakeSure = false
-              this.dialogProfAudit = false
-              this.addshow = false
+              // this.getannualdata()
+              // this.dialogMakeSure = false
+              // this.dialogProfAudit = false
+              // this.addshow = false
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -38,7 +38,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="annualAudit()"
                      v-if="auditBtn && AnnualStatus == '5'">审批</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="fenbanBtn" v-if="auditBtn && AnnualStatus == '10'">
-            提交分办</el-button>
+            提交</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -754,14 +754,10 @@
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
 
@@ -1195,11 +1191,10 @@
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
@@ -1999,10 +1994,11 @@
                 type: 'success',
                 message: res.data.message
               })
-              this.getannualdata()
-              this.dialogMakeSure = false
-              this.dialogProfAudit = false
-              this.addshow = false
+              // this.getannualdata()
+              // this.dialogMakeSure = false
+              // this.dialogProfAudit = false
+              // this.addshow = false
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -1076,6 +1076,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',
@@ -1677,6 +1678,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -1405,7 +1405,7 @@
       delFile (row) {
         let confirmmsg = '此操作将彻底删除该数据, 是否继续?'
         if (row.OldFileUrl !== '') {
-          confirmmsg = '审批通过后将彻底删除该数据，是否继续？'
+          confirmmsg = '审批通过后将彻底删除该资质，相关联的准入项目将一并删除，是否继续？'
         }
         this.$confirm(confirmmsg, '提示', {
           confirmButtonText: '确定',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -15,17 +15,17 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"-->
           <!--v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity('5')"
             v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="this.formData.Status == '10'">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
         </span>
@@ -391,6 +391,7 @@
 
     data() {
       return {
+        btnstatus: '',
         backRemark: '',
         chooseAuditorVisible: false,
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
@@ -741,6 +742,7 @@
           });
       },
       isAccess() {
+        this.auditBtn = false
         let params = {
           id: this.formData.CertId,
           auditstepcode: this.auditstepcode,
@@ -926,8 +928,9 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity (val) {
         this.auditOrgChange()
+        this.btnstatus = val
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -1051,15 +1054,20 @@
         }
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas()
-            this.dialogVisible = false
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
+            if (this.btnstatus == '5') {
+              this.initDatas()
+              this.dialogVisible = false
+              this.dialogMakeSure = false
+              this.dialogAllocation = false
+              this.dialogMakeSure2 = false
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            if (this.btnstatus != '5') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -13,18 +13,18 @@
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '3' && this.formData.InStyle != '2'">提交专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '4' && this.formData.InStyle != '2'">专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity('5')"
             v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
           <!--&& this.formData.InStyle != '3'-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="this.formData.Status == '10'">分办</el-button>
           <!--<router-link>-->
             <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
@@ -404,6 +404,7 @@
 
     data() {
       return {
+        btnstatus: '',
         backRemark: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         auditer: '',
@@ -762,6 +763,7 @@
         }
       },
       isAccess() {
+        this.auditBtn = false
         let params = {
           id: this.formData.CertId,
           auditstepcode: this.auditstepcode,
@@ -946,8 +948,9 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity (val) {
         this.auditOrgChange()
+        this.btnstatus = val
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -1070,15 +1073,20 @@
         }
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas()
-            this.dialogVisible = false
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
+            if (this.btnstatus == '5') {
+              this.initDatas()
+              this.dialogVisible = false
+              this.dialogMakeSure = false
+              this.dialogAllocation = false
+              this.dialogMakeSure2 = false
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            if (this.btnstatus != '5') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -13,17 +13,17 @@
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity('5')"
             v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity()"
             v-if="this.formData.Status == '10'">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
@@ -389,6 +389,7 @@
 
     data() {
       return {
+        btnstatus: '',
         backRemark: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         equipmentList: [], // 企业主要装备情况
@@ -738,6 +739,7 @@
           });
       },
       isAccess() {
+        this.auditBtn = false
         let params = {
           id: this.formData.CertId,
           auditstepcode: this.auditstepcode,
@@ -924,8 +926,9 @@
         })
       },
 
-      AuditEntity() {
+      AuditEntity (val) {
         this.auditOrgChange()
+        this.btnstatus = val
         if (this.formData.Status === '3') {
           this.dialogAllocation = true
         } else if (this.formData.Status === '1') {
@@ -1049,15 +1052,20 @@
         }
         apiCert.auditEntityFir(this.certId, audit, params, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas()
-            this.dialogVisible = false
-            this.dialogMakeSure = false
-            this.dialogAllocation = false
-            this.dialogMakeSure2 = false
+            if (this.btnstatus == '5') {
+              this.initDatas()
+              this.dialogVisible = false
+              this.dialogMakeSure = false
+              this.dialogAllocation = false
+              this.dialogMakeSure2 = false
+            }
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            if (this.btnstatus != '5') {
+              this.$router.push('/')
+            }
           } else {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -508,6 +508,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',
@@ -573,6 +574,7 @@
                 type: 'success',
                 message: res.data.message
               })
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/goodsedit.vue

@@ -511,6 +511,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',
@@ -578,6 +579,7 @@
                 type: 'success',
                 message: res.data.message
               })
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -516,6 +516,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.$router.push('/')
           } else {
             this.$message({
               type: 'warning',
@@ -581,6 +582,7 @@
                 type: 'success',
                 message: res.data.message
               })
+              this.$router.push('/')
             } else {
               this.$message({
                 type: 'warning',