2
3
Просмотр исходного кода

改名

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing 6 лет назад
Родитель
Сommit
7a9b6c3902

+ 12 - 9
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -20,11 +20,11 @@
           <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"
-            v-if="auditBtn && this.formData.Status == '3'">提交专业审</el-button>
+            v-if="auditBtn && this.formData.Status == '3'">提交专业审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status == '4'">专业审</el-button>
+            v-if="auditBtn && this.formData.Status == '4'">专业审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status == '5'">集中审</el-button>
+            v-if="auditBtn && this.formData.Status == '5'">集中审</el-button>
           <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>
@@ -189,7 +189,7 @@
 
       </el-tabs>
     </el-card>
-    <el-dialog title="审核" :visible.sync="dialogMakeSure">
+    <el-dialog :title="atitle" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
           <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
@@ -261,7 +261,7 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="分配" :visible.sync="dialogAllocation">
+    <el-dialog title="提交领导审核" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
@@ -409,6 +409,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
+        atitle: '审核',
         auditstepcode: '',
         auditBtn: false,
         companyid: '',
@@ -631,16 +632,18 @@
               this.auditTitle = '复审'
               this.auditstepcode = 'SECOND_TRIAL'
             } else if (this.formData.Status === '3') {
-              this.auditTitle = '提交专业审'
+              this.auditTitle = '提交专业审'
               this.auditstepcode = 'PROF_RECE'
             } else if (this.formData.Status === '4') {
-              this.auditTitle = '专业审批'
+              this.atitle = '专业审核'
+              this.auditTitle = '专业审核'
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
-              this.auditTitle = '集中审批'
+              this.atitle = '集中评审'
+              this.auditTitle = '集中评审'
               this.auditstepcode = 'PROF_REGULATION'
               if (this.inStyle == '1') {
-                this.shenheForm.AuditorRemark = '集中评审通过'
+                this.shenheForm.AuditorRemark = '集中评审通过'
               } else if (this.inStyle == '2') {
                 this.shenheForm.AuditorRemark = '一级物资备案准入'
               } else if (this.inStyle == '3') {

+ 10 - 7
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -18,11 +18,11 @@
           <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"
-            v-if="auditBtn && this.formData.Status == '3' && this.formData.InStyle != '2'">提交专业审</el-button>
+            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"
-            v-if="auditBtn && this.formData.Status == '4' && this.formData.InStyle != '2'">专业审</el-button>
+            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"
-            v-if="auditBtn && this.formData.Status == '5' && this.formData.InStyle != '3'">集中审</el-button>
+            v-if="auditBtn && this.formData.Status == '5' && this.formData.InStyle != '3'">集中审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
           <!--<router-link>-->
@@ -189,7 +189,7 @@
 
       </el-tabs>
     </el-card>
-    <el-dialog title="审核" :visible.sync="dialogMakeSure">
+    <el-dialog :title="atitle" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'"> -->
         <!--<el-select ref="selectauditOrg" v-model="majorDept" placeholder="请选择"-->
@@ -271,7 +271,7 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="分配" :visible.sync="dialogAllocation">
+    <el-dialog title="提交领导审核" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
@@ -430,6 +430,7 @@
         delete_flat:true,
         aduitlabel: '审核人',
         auditTitle: '审批',
+        atitle: '审核',
         auditBtn: false,
         companyid: '',
         inStyle: '',
@@ -691,13 +692,15 @@
               this.auditTitle = '提交专业审批'
               this.auditstepcode = 'PROF_RECE'
             } else if (this.formData.Status === '4') {
+              this.atitle = '专业审核'
               this.auditTitle = '专业审批'
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
-              this.auditTitle = '集中审批'
+              this.atitle = '集中评审'
+              this.auditTitle = '集中评审'
               this.auditstepcode = 'PROF_REGULATION'
               if (this.inStyle == '1') {
-                this.shenheForm.AuditorRemark = '集中评审通过'
+                this.shenheForm.AuditorRemark = '集中评审通过'
               } else if (this.inStyle == '2') {
                 this.shenheForm.AuditorRemark = '一级物资备案准入'
               } else if (this.inStyle == '3') {

+ 11 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -18,11 +18,11 @@
           <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"
-            v-if="auditBtn && this.formData.Status == '3'">提交专业审</el-button>
+            v-if="auditBtn && this.formData.Status == '3'">提交专业审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status == '4'">专业审</el-button>
+            v-if="auditBtn && this.formData.Status == '4'">专业审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status == '5'">集中审</el-button>
+            v-if="auditBtn && this.formData.Status == '5'">集中审</el-button>
           <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>-->
@@ -185,7 +185,7 @@
         <!--</el-tab-pane>-->
       </el-tabs>
     </el-card>
-    <el-dialog title="审核" :visible.sync="dialogMakeSure">
+    <el-dialog :title="atitle" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态" required>
           <template>
@@ -259,7 +259,7 @@
         <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="分配" :visible.sync="dialogAllocation">
+    <el-dialog title="提交领导审核" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <!-- <el-form-item label="审批人部门">
           <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
@@ -401,6 +401,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
+        atitle: '审核',
         auditBtn: false,
         serviceId: '',
         certId: '',
@@ -631,13 +632,15 @@
               this.auditTitle = '提交专业审批'
               this.auditstepcode = 'PROF_RECE'
             } else if (this.formData.Status === '4') {
-              this.auditTitle = '专业审批'
+              this.atitle = '专业审核'
+              this.auditTitle = '专业审核'
               this.auditstepcode = 'PROF_AUDIT'
             } else if (this.formData.Status === '5') {
-              this.auditTitle = '集中审批'
+              this.atitle = '集中评审'
+              this.auditTitle = '集中评审'
               this.auditstepcode = 'PROF_REGULATION'
               if (this.inStyle == '1') {
-                this.shenheForm.AuditorRemark = '集中评审通过'
+                this.shenheForm.AuditorRemark = '集中评审通过'
               } else if (this.inStyle == '2') {
                 this.shenheForm.AuditorRemark = '一级物资备案准入'
               } else if (this.inStyle == '3') {