审批部分修复

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -846,4 +846,15 @@
 .formDataInfo .el-textarea__inner[readonly]:focus{
     border-color:#DCDFE6;
 }
+.formDataInfo .el-input__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+.formDataInfo .el-textarea__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+
 </style>

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

@@ -951,4 +951,16 @@
 .formDataInfo .el-textarea__inner[readonly]:focus{
     border-color:#DCDFE6;
 }
+
+.formDataInfo .el-input__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+.formDataInfo .el-textarea__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+
 </style>

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

@@ -830,4 +830,15 @@
 .formDataInfo .el-textarea__inner[readonly]:focus{
     border-color:#DCDFE6;
 }
+.formDataInfo .el-input__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+.formDataInfo .el-textarea__inner[disabled]{
+    color:black;
+    opacity: 1;
+    background-color: white;
+}
+
 </style>

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

@@ -546,14 +546,17 @@
         flag: "01",
         rules: {
           WorkerTotal: [{
+            required: true,
             validator: checkWorkerTotal,
             trigger: 'blur'
           }],
           TechnicalNum: [{
+            required: true,
             validator: checkTechnicalNum,
             trigger: 'blur'
           }],
           SkillerTotal: [{
+            required: true,
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]

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

@@ -37,7 +37,7 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
             </div>
-            <basis-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
+            <basis-info ref="BasisInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
             </basis-info>
           </el-card>
         </el-tab-pane>
@@ -159,7 +159,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
+          <business-list ref="businessList" :data.sync="businessList" :candelete="delete_flat" :canadd="add_flat" height="360px"
             style="margin-top: 20px"></business-list>
         </el-tab-pane>
 
@@ -404,6 +404,7 @@
         dialogMakeSure2: false,
         dialogAllocation: false,
         add_flat: false,
+        delete_flat:true,
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
@@ -580,6 +581,20 @@
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
+            this.$refs["BasisInfo"].CityAry = [];
+            this.$refs["BasisInfo"].CityAry.push(this.formData.Province);
+            this.$refs["BasisInfo"].CityAry.push(this.formData.City);
+            this.$refs["BasisInfo"].CityAry.push(this.formData.Street);
+            this.$refs["BasisInfo"].LinkCityAry = [];
+            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkProvince);
+            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkCity);
+            this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkStreet);
+            if (this.formData.CredentialFlag != "") {
+                this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
+            }
+            if (this.formData.Status != 4) {
+              this.delete_flat = false
+            }
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum

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

@@ -37,7 +37,7 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
             </div>
-            <goods-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
+            <goods-info ref="GoodsInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
             </goods-info>
           </el-card>
         </el-tab-pane>
@@ -159,8 +159,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></business-list>
+          <goods-list ref="goodsList" :data.sync="goodsList" :canadd="add_flat"  :candelete="delete_flat" height="360px"
+            style="margin-top: 20px"></goods-list>
         </el-tab-pane>
 
         <el-tab-pane label="企业资质">
@@ -354,7 +354,7 @@
   import WinningList from '@/components/oilsupplier/winninglist'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
-  import BusinessList from '@/components/oilsupplier/businesslist'
+  import GoodsList from '@/components/oilsupplier/goodslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
@@ -371,7 +371,7 @@
       PatentList, // 专利及专有技术列表
       WinningList, // 近三年省部级及以上获奖项目列表
       AuditbusList, // 待审核业务
-      BusinessList, // 选择准入范围
+      GoodsList, // 选择准入范围
       GoodsInfo
     },
     computed: {
@@ -394,7 +394,7 @@
         winningList: [], // 近三年省部级及以上获奖项目
         auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
-        businessList: [], // 准入业务
+        goodsList: [], // 准入业务
         secauditerOptions: [],
         auditerCurOptions: [],
         organizeOption: [],
@@ -420,6 +420,7 @@
         dialogMakeSure2: false,
         dialogAllocation: false,
         add_flat: false,
+        delete_flat:true,
         aduitlabel: '审核人',
         auditTitle: '审批',
         auditBtn: false,
@@ -630,6 +631,20 @@
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
+            this.$refs["GoodsInfo"].CityAry = [];
+            this.$refs["GoodsInfo"].CityAry.push(this.formData.Province);
+            this.$refs["GoodsInfo"].CityAry.push(this.formData.City);
+            this.$refs["GoodsInfo"].CityAry.push(this.formData.Street);
+            this.$refs["GoodsInfo"].LinkCityAry = [];
+            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkProvince);
+            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkCity);
+            this.$refs["GoodsInfo"].LinkCityAry.push(this.formData.LinkStreet);
+            if (this.formData.CredentialFlag != "") {
+                this.$refs["GoodsInfo"].showorhid(this.formData.CredentialFlag)
+            }
+            if (this.formData.Status != 4) {
+                this.delete_flat = false
+            }
             console.log("--this.formData--", this.formData)
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
@@ -682,7 +697,7 @@
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+            this.$refs['goodsList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.isAccess()
           }).catch(err => {
             console.error(err)

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

@@ -157,8 +157,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" :canadd="add_flat" height="360px"
-            style="margin-top: 20px"></business-list>
+          <tech-list ref="techList" :data.sync="techList" :candelete="delete_flat"  :canadd="add_flat" height="360px"
+            style="margin-top: 20px"></tech-list>
         </el-tab-pane>
 
         <el-tab-pane label="企业资质">
@@ -340,7 +340,7 @@
   import WinningList from '@/components/oilsupplier/winninglist'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
-  import BusinessList from '@/components/oilsupplier/businesslist'
+  import TechList from '@/components/oilsupplier/techlist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
   export default {
@@ -357,7 +357,7 @@
       PatentList, // 专利及专有技术列表
       WinningList, // 近三年省部级及以上获奖项目列表
       AuditbusList, // 待审核业务
-      BusinessList, // 选择准入范围
+      TechList, // 选择准入范围
       TechInfo
     },
     computed: {
@@ -377,6 +377,7 @@
         auditbusList: [], // 待审核业务
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
+        techList: [], // 准入业务
         auditerCurOptions: [],
         orgtreelist: [],
         secorgtreelist: [],
@@ -396,6 +397,7 @@
         dialogAllocation: false,
         chooseAuditorVisible: false,
         add_flat: false,
+        delete_flat:true,
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
@@ -577,6 +579,20 @@
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
+            this.$refs["TechInfo"].CityAry = [];
+            this.$refs["TechInfo"].CityAry.push(this.formData.Province);
+            this.$refs["TechInfo"].CityAry.push(this.formData.City);
+            this.$refs["TechInfo"].CityAry.push(this.formData.Street);
+            this.$refs["TechInfo"].LinkCityAry = [];
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince);
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity);
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet);
+            if (this.formData.CredentialFlag != "") {
+                this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
+            }
+            if (this.formData.Status != 4) {
+                this.delete_flat = false
+            }
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum
@@ -630,7 +646,7 @@
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
+            this.$refs['techList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
 
             this.isAccess()
           }).catch(err => {