仅准入申请待入库时单独跳转审批页面；fix待入库人员权限判断

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -584,7 +584,7 @@
       },
       rowClick (val) {
         let SupplierType = ''
-        if (val.Status === '7' && val.Type !== '4') {
+        if (val.Status === '7' && val.Type === '1') {
           // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
           if (val.SupplierTypeCode === '01') {
             SupplierType = 'goodsedit'

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

@@ -29,6 +29,7 @@
           <!--<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="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '7'">审批入库</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -1092,6 +1093,8 @@
             this.shenheForm.AuditorRemark = '集中评审通过。'
           } else if (_this.formData.Status === '6') {
             this.auditstepcode = 'PAYING_FEE'
+          } else if (_this.formData.Status === '7') {
+            this.auditstepcode = 'PROF_REGULATION_STORAGE'
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_JS'
           }
@@ -1486,11 +1489,11 @@
         api2.updatePayStatus(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('交费成功')
-            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
+            this.initDatas()
           } else {
             this.$message({
               type: 'warning',

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

@@ -31,6 +31,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">1{{auditTitle}}</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '7'">审批入库</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -1181,6 +1182,8 @@
           } else if (this.formData.Status === '6') {
             this.auditTitle = '确认交费'
             this.auditstepcode = 'PAYING_FEE'
+          } else if (_this.formData.Status === '7') {
+            this.auditstepcode = 'PROF_REGULATION_STORAGE'
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_WZ'
           }
@@ -1349,13 +1352,13 @@
         api2.separateAuditEntity(this.AppendId, params, this.$axios).then(res => {
           if (res.data.code === 0) {
             console.log('审批提交，成功返回')
-            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
             })
             this.btnloading = false
             this.dialogSecUnitSeparateVisible = false
+            this.initDatas() // TODO 弹框提示
           } else {
             this.$message({
               type: 'warning',

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

@@ -30,6 +30,7 @@
           <!--<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="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '7'">审批入库</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -1097,6 +1098,8 @@
             this.shenheForm.AuditorRemark = '集中评审通过。'
           } else if (_this.formData.Status === '6') {
             this.auditstepcode = 'PAYING_FEE'
+          } else if (_this.formData.Status === '7') {
+            this.auditstepcode = 'PROF_REGULATION_STORAGE'
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_JF'
           }

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

@@ -24,10 +24,10 @@
             <!--</el-steps>-->
             <!--&lt;!&ndash; <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> &ndash;&gt;-->
           <!--</el-popover>-->
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
-          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>

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

@@ -24,10 +24,10 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>-->
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
-          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="createWZAccessCardNo">生成准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
           <!-- <router-link :to="'/oilsupplier/supplierstorage/goodslist'"> -->
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn" @click="$router.back(-1)">返回
             </el-button>

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

@@ -24,10 +24,10 @@
             <!--</el-steps>-->
             <!--&lt;!&ndash; <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button> &ndash;&gt;-->
           <!--</el-popover>-->
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="createJFAccessCardNo">生成准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
-          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="createJFAccessCardNo">生成准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="saveAccessCardNo">保存准入编码</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="confirm" :loading="btnLoading">确认入库</el-button>
+          <el-button type="warning" size="mini" style="margin-right: 5px" v-if="formData.Status == '7'" @click="backStatus" :loading="btnLoading">退回</el-button>
           <router-link :to="'/oilsupplier/supplierstorage/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>