根据需求调整字段名称等

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

@@ -30,8 +30,8 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" multiple v-model="UnitRelationAry" :disabled="!canUpdateSupplier"
-              @change="unitRelationChange" filterable placeholder="请选择" style="width: 100%">
+            <el-select ref="SpecType" multiple v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
+               placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
             </el-select>

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

@@ -2,7 +2,7 @@
   <div>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">分类</span>
+        <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-right: 3px" @click="nextStep()" v-if="canadd">提交审批
           </el-button>
@@ -31,7 +31,7 @@
 
     <el-card class="box-card" style="margin-top: 10px;">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">分类文档</span>
+        <span style="font-weight: bold">资质列表</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog" v-if="canadd">添加</el-button>
       </div>
       <subfile-list ref="subfileList" :data.sync="subfileList" :SupplierId="SupplierId" :SupplierCertId="SupplierCertId"
@@ -203,7 +203,7 @@
         this.SupplierId = serviceId
         this.SupplierTypeCode = SupplierTypeCode
         this.SupplierCertId = certId
-        this.initData() 
+        this.initData()
       },
       initData() {
         let _this = this

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

@@ -28,7 +28,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" multiple v-model="UnitRelationAry" :disabled="!canUpdateSupplier" @change="unitRelationChange" filterable
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
                        placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">

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

@@ -9,15 +9,15 @@
             :disabled="scope.row.FileType == '1' || !canadd" @click="deletedata(scope.row)">删除</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-      <!-- <el-table-column prop="NeedFileCode" label="分类编码" show-overflow-tooltip></el-table-column> -->
-      <el-table-column prop="FileName" label="文件名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+      <!--<el-table-column prop="NeedFileCode" label="分类编码" show-overflow-tooltip></el-table-column>-->
+      <el-table-column prop="FileName" label="资质文件" show-overflow-tooltip></el-table-column>
       <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ jstimehandle(scope.row.EffectDate+'') }}
         </template>
       </el-table-column>
-      <el-table-column prop="OtherRemark" label="其他信息" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
       <el-table-column prop="Remark" label="备注信息" show-overflow-tooltip></el-table-column>
     </el-table>
 
@@ -25,17 +25,17 @@
       <el-form :model="SubfileForm" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="分类名称" required>
+            <el-form-item label="资质名称" required>
               <el-select ref="refSupplierCertSub" v-model="SubfileForm.SupplierCertSubId" style="width:100%"
-                placeholder="请选择分类名称" @change="getCode()">
+                placeholder="请选择资质名称" @change="getCode()">
                 <el-option v-for="item in businessList" :label="item.Name" :value="item.Id" :key="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="文件分类" required>
-              <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件分类"></el-input>
+            <el-form-item label="资质文件" required>
+              <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="12">

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

@@ -28,7 +28,7 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" multiple v-model="UnitRelationAry" @change="unitRelationChange" filterable
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode"
                        placeholder="请选择" style="width: 100%" :disabled="!canUpdateSupplier">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                          :value="item.Value">

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

@@ -446,10 +446,10 @@
         this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkProvince)
         this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkCity)
         this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["BasisInfo"].UnitRelationAry = []
+        /*this.$refs["BasisInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs["BasisInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }
+        }*/
       },
 
       isCanUpdateSupplier(supplierId) {
@@ -497,10 +497,10 @@
             this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkProvince)
             this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkCity)
             this.$refs["BasisInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["BasisInfo"].UnitRelationAry = []
+            /*this.$refs["BasisInfo"].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs["BasisInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }
+            }*/
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId

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

@@ -471,10 +471,10 @@
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs['GoodsInfo'].UnitRelationAry = []
+        /*this.$refs['GoodsInfo'].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['GoodsInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }
+        }*/
       },
 
       isCanUpdateSupplier (supplierId) {
@@ -522,10 +522,10 @@
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs['GoodsInfo'].UnitRelationAry = []
+            /*this.$refs['GoodsInfo'].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['GoodsInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }
+            }*/
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId

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

@@ -445,10 +445,10 @@
         this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
         this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
         this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-        this.$refs["TechInfo"].UnitRelationAry = []
+        /*this.$refs["TechInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }
+        }*/
       },
 
       isCanUpdateSupplier(supplierId) {
@@ -499,11 +499,11 @@
             this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
             this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
             this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
-            this.$refs["TechInfo"].UnitRelationAry = []
+            /*this.$refs["TechInfo"].UnitRelationAry = []
 
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }
+            }*/
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -164,12 +164,13 @@
           if (this.appclient == 'lims') { //大港油田lims系统不用邮箱
             callback()
           }
-          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          /*let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
           if (!re.test(value)) {
             callback(new Error('请输入正确的邮箱地址'))
           } else {
             callback()
-          }
+          }*/
+          callback()
         }
       }
       return {