解锁

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -467,6 +467,7 @@ func (this *OilSupplierCertController) UpdateEntity() {
 // @router /updatestorage/:id [post]
 func (this *OilSupplierCertController) UpdateStorage() {
 	id := this.Ctx.Input.Param(":id")
+	status := this.GetString("Status")
 	var errinfo ErrorInfo
 	if id == "" {
 		errinfo.Message = "操作失败！请求信息不完整"
@@ -481,8 +482,13 @@ func (this *OilSupplierCertController) UpdateStorage() {
 
 	//var jsonBlob = this.Ctx.Input.RequestBody
 	//json.Unmarshal(jsonBlob, &model)
+	if status == suppliercert.NOPASS_STATUS {
+		model.Status = suppliercert.DRAFT_STATUS
+	} else {
+		model.Status = suppliercert.STORE_STATUS
+	}
+
 	model.Step = 7
-	model.Status = suppliercert.STORE_STATUS
 	model.StorageOn = time.Now()
 	model.ModifiedOn = time.Now()
 	model.ModifiedBy = this.User.Realname
@@ -838,12 +844,8 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 			return
 		}
 	} else {
-		if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
-			ActiComplete.Result = suppliercert.NOPASS_STATUS
-		} else {
-			ActiComplete.Result = suppliercert.DRAFT_STATUS
 
-		}
+		ActiComplete.Result = "0"
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
@@ -861,8 +863,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 			audithistoryentity.CreateBy = this.User.Realname
 			audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			certSrv.InsertEntity(audithistoryentity)
-
-			supplierCertEntity.Status = "0"
+			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
+				supplierCertEntity.Status = suppliercert.NOPASS_STATUS
+			} else {
+				supplierCertEntity.Status = suppliercert.DRAFT_STATUS
+			}
 			supplierCertEntity.Step = 1
 			supplierCertEntity.WorkflowId = ""
 			cols := []string{

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -38,10 +38,11 @@ export default {
       data: formData
     })
   },
-  updateStorage (entityId, myAxios) {
+  updateStorage (entityId, params, myAxios) {
     return myAxios({
       url: '/suppliercert/updatestorage/' + entityId,
-      method: 'post'
+      method: 'post',
+      params: params
     })
   },
   deleteEntity (entityId, myAxios) {

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

@@ -3,6 +3,7 @@
     <el-card class="box-card" style="margin-top: 10px;">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
+        {{canadd}}
         <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()" v-if="canadd">
           提交审批
         </el-button>

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

@@ -605,7 +605,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.$refs['BasisInfo'].CityAry = []

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

@@ -607,7 +607,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             console.log(this.add_flat)

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

@@ -604,7 +604,7 @@
             this.formDataCert.DesignerTotal = this.formData.DesignerTotal
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId

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

@@ -11,7 +11,6 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
           <el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
@@ -24,7 +23,7 @@
             </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="confirm">确认入库</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-1'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -52,10 +51,6 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status == 0">
-                  保存人员结构情况</el-button>
-              </span>
             </div>
 
             <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert">
@@ -136,8 +131,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要装备情况</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <equipment-list ref="equipmentList" :data.sync="equipmentList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
@@ -146,8 +139,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></performance-list>
@@ -156,7 +147,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>拥有专利、专有技术及工法</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog" v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <patent-list ref="patentList" :data.sync="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
               :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -166,8 +156,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -476,12 +464,15 @@
     },
     methods: {
       confirm () {
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认解锁', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             this.initDatas()
             if (res.data.code === 0) {
               this.$message({
@@ -612,7 +603,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.$refs['BasisInfo'].CityAry = []

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

@@ -11,7 +11,6 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
           <el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
@@ -24,7 +23,7 @@
             </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="confirm">确认入库</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-1'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -37,10 +36,6 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status == 0">保存基本信息
-                </el-button>
-              </span>
             </div>
             <goods-info ref="GoodsInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
               :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
@@ -52,10 +47,6 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status == 0">
-                  保存人员结构情况</el-button>
-              </span>
             </div>
 
             <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert">
@@ -136,8 +127,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要装备情况</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <equipment-list ref="equipmentList" :data.sync="equipmentList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
@@ -146,8 +135,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" style="margin-top: 20px"></performance-list>
@@ -156,8 +143,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>拥有专利、专有技术及工法</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <patent-list ref="patentList" :data.sync="patentList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -167,8 +152,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId+''"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -189,11 +172,6 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
-              <!-- <span style="float: right;">
-                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
-                  @click="AuditEntity">提交审批
-                </el-button>
-              </span> -->
             </div>
             <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
           </el-card>
@@ -212,41 +190,6 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-   <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="70px">
-        <el-row>
-          <!--<el-col :span="24">
-            <el-form-item label="二级单位">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                filterable style="width: 100%" @change="auditOrgChang" v-model="secOrganize" placeholder="请选择组织">
-              </el-cascader>
-            </el-form-item>
-          </el-col>-->
-          <el-col :span="24">
-            <el-form-item label="审批人">
-              <!--<el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 90%" filterable
-                allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.id" :label="item.realname" :value="item.id">
-                </el-option>
-              </el-select>-->
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择审批人">
-                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="说明">
-              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
-      </span>
-    </el-dialog>
 
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
@@ -478,12 +421,15 @@
     },
     methods: {
       confirm () {
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认解锁', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
               this.initDatas()
               this.$message({
@@ -585,18 +531,6 @@
           console.error(err)
         })
       },
-      equipmentdialog () {
-        this.$refs['equipmentList'].showDialog()
-      },
-      performancedialog () {
-        this.$refs['performanceList'].showDialog()
-      },
-      patentdialog () {
-        this.$refs['patentList'].showDialog()
-      },
-      winningdialog () {
-        this.$refs['winningList'].showDialog()
-      },
 
       initDatas () {
         this.isCanUpdateSupplier(this.formData.Id)
@@ -615,10 +549,10 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
-            console.log(this.add_flat)
+            console.log(this.add_flat, this.formData.Status)
             this.$refs['GoodsInfo'].CityAry = []
             this.$refs['GoodsInfo'].CityAry.push(this.formData.Province)
             this.$refs['GoodsInfo'].CityAry.push(this.formData.City)
@@ -894,7 +828,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -11,7 +11,6 @@
           <i class="icon icon-table2"></i> 信息
         </span>
         <span style="float: right;">
-          <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button>
           <el-popover>
             <el-steps :active="formData.Step" direction="vertical" align-center finish-status="success">
               <el-step title="填信息"></el-step>
@@ -46,10 +45,6 @@
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity" v-if="formDataCert.Status == 0">保存基本信息
-                </el-button>
-              </span>
             </div>
             <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
               :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
@@ -62,8 +57,6 @@
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="updateNumberEntity" v-if="formDataCert.Status == 0">
-                  保存人员结构情况</el-button>
               </span>
             </div>
 
@@ -145,8 +138,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要装备情况</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <equipment-list ref="equipmentList" :data.sync="equipmentList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
@@ -155,8 +146,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要工程业绩</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <performance-list ref="performanceList" :data.sync="performanceList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></performance-list>
@@ -165,8 +154,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>拥有专利、专有技术及工法</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <patent-list ref="patentList" :data.sync="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
               :canadd="add_flat" height="360px" style="margin-top: 20px"></patent-list>
@@ -175,8 +162,6 @@
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
-              <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
-                v-if="formDataCert.Status == 0">添加</el-button>
             </div>
             <winning-list ref="winningList" :data.sync="winningList" :SupplierCertId="certId"
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px">
@@ -484,12 +469,15 @@
     },
     methods: {
       confirm () {
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认解锁', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
               this.initDatas()
               this.$message({
@@ -619,7 +607,7 @@
             this.formDataCert.DesignerTotal = this.formData.DesignerTotal
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/basislist.vue

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>基建类待入库列表</el-breadcrumb-item>
+      <el-breadcrumb-item>基建类列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 基建类待入库列表
+          <i class="icon icon-table2"></i> 基建类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/suppliernopass/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/goodslist.vue

@@ -7,7 +7,7 @@
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 物资类待入库列表
+          <i class="icon icon-table2"></i> 物资类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/suppliernopass/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/techlist.vue

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>技术服务类已入库列表</el-breadcrumb-item>
+      <el-breadcrumb-item>技术服务类列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 技术服务类已入库列表
+          <i class="icon icon-table2"></i> 技术服务类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -29,7 +29,7 @@
       <el-table :data="entityList" border height="calc(100vh - 246px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstorage/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/suppliernopass/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="详细信息" size="mini">打开</el-button>
             </router-link>
 

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

@@ -476,12 +476,15 @@
     },
     methods: {
       confirm () {
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             this.initDatas()
             if (res.data.code === 0) {
               this.$message({
@@ -612,7 +615,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.$refs['BasisInfo'].CityAry = []

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

@@ -483,7 +483,10 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
               this.initDatas()
               this.$message({
@@ -615,7 +618,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             console.log(this.add_flat)

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

@@ -484,12 +484,15 @@
     },
     methods: {
       confirm () {
-        this.$confirm('确认提交入库','提示',{
+        this.$confirm('确认提交入库', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          apiCert.updateStorage(this.certId, this.$axios).then(res => {
+          let params = {
+            Status: this.formData.Status
+          }
+          apiCert.updateStorage(this.certId, params, this.$axios).then(res => {
             if (res.data.code === 0) {
               this.initDatas()
               this.$message({
@@ -619,7 +622,7 @@
             this.formDataCert.DesignerTotal = this.formData.DesignerTotal
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId

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

@@ -612,7 +612,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.$refs['BasisInfo'].CityAry = []

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

@@ -615,7 +615,7 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             console.log(this.add_flat)

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

@@ -619,7 +619,7 @@
             this.formDataCert.DesignerTotal = this.formData.DesignerTotal
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
-            if (this.formData.Status > 0) {
+            if (this.formData.Status != 0) {
               this.add_flat = false
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId