企业信息及企业情况改名

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

@@ -129,7 +129,7 @@
           })
       },
       savedata() {
-        if (this.Title == '新增企业主要装备情况') {
+        if (this.Title == '企业主要装备情况') {
           this.addEquipment()
         } else if (this.Title == '编辑企业主要装备情况') {
           this.editEquipment()
@@ -212,7 +212,7 @@
           .catch(() => {});
       },
       showDialog() {
-        this.Title = '新增企业主要装备情况'
+        this.Title = '企业主要装备情况'
         this.EquipmentForm.Id = 0
         this.EquipmentForm.SupplierCertId = this.SupplierCertId
         this.EquipmentForm.SupplierTypeCode = this.SupplierTypeCode

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

@@ -545,7 +545,7 @@
           label: '五证合一',
         }, {
           value: '3',
-          label: '正常'
+          label: '常规'
         }],
         companyReadonly: false,
         companynames: [],
@@ -575,19 +575,19 @@
             required: true,
             validator: checkMobile,
             trigger: 'change'
-          }, ],
+          }],
 
           Telphone: [{
             required: true,
             validator: checkTelphone,
             trigger: 'change'
-          }, ],
-           BusinessScope:[{
+          }],
+          BusinessScope:[{
             required: true,
             message: '请输入营业范围',
             trigger: 'change'
           }],
-           ZipCode: [{
+          ZipCode: [{
             required: true,
             validator: checkZipCode,
             trigger: 'change'
@@ -601,44 +601,43 @@
             required: true,
             validator: checkSupplierName,
             trigger: 'change'
-          }, ],
-           Country: [{
+          }],
+          Country: [{
             required: true,
             message: '请输入国家',
             trigger: 'change'
-          }, ],
+          }],
           CommercialNo: [{
             required: true,
             validator: checkCommercialNo,
             trigger: 'change'
-          }, ],
+          }],
           CountryTaxNo: [{
             required: true,
             message: '请输入税务登记证编号',
             trigger: 'change'
-          }, ],
+          }],
           CompanyType: [{
             required: true,
             message: '请选择公司类型',
             trigger: 'change'
-          }, ],
+          }],
           LegalPerson: [{
             required: true,
             message: '请输入法定代表人姓名',
             trigger: 'change'
-          }, ],
+          }],
           Province: [{
             required: true,
             message: '请选择省市区',
             trigger: 'change'
-          }, ],
+          }],
           Address: [{
             required: true,
             message: '请输入注册地址',
             trigger: 'change'
-          }, ],
-          EMail: [
-          {
+          }],
+          EMail: [{
             required: false,
             validator: checkemail,
             trigger: 'change'
@@ -647,34 +646,33 @@
             required: true,
             message: '请输入组织机构代码',
             trigger: 'change'
-          }, ],
+          }],
 
           RegCapital: [{
             required: true,
             message: '请输入注册资本',
             trigger: 'change'
-          }, ],
+          }],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',
             trigger: 'change'
-          }, ],
+          }],
           BankAccount: [{
             required: true,
             message: '请输入银行账号',
             trigger: 'change'
-          }, ],
+          }],
           ContactName: [{
             required: true,
             message: '请输入联系人姓名',
             trigger: 'change'
-          }, ],
-
-            CompanyTel: [{
+          }],
+          CompanyTel: [{
             required: true,
             message: '请输入财务电话',
             trigger: 'change'
-          }, ],
+          }],
 
           LinkProvince: [{
             required: true,

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

@@ -9,9 +9,9 @@
             :disabled="!canadd">删除</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="ProjectName" label="设备名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ProjectName" label="项目名称" show-overflow-tooltip></el-table-column>
       <el-table-column prop="BearContent" label="主要内容" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="OwnerUnit" label="业主单位" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="OwnerUnit" label="合作单位" show-overflow-tooltip></el-table-column>
       <el-table-column prop="StartTime" label="起始时间" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ jstimehandle(scope.row.StartTime+'') }}
@@ -39,7 +39,7 @@
       <el-form ref="refPerformance" :model="PerformanceForm" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="设备名称">
+            <el-form-item label="项目名称">
               <el-input v-model="PerformanceForm.ProjectName"></el-input>
             </el-form-item>
           </el-col>
@@ -49,7 +49,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="业主单位">
+            <el-form-item label="合作单位">
               <el-input v-model="PerformanceForm.OwnerUnit"></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +66,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有无事故">
+            <el-form-item label="有无事故"
+                          :rules="[
+                                   { required: true, message: '有无事故不能为空', trigger: 'change'}
+                                  ]" >
               <el-select ref="refplace" v-model="PerformanceForm.Tudge" style="width:100%"
                 placeholder="请选择是否发生过质量、安全、环境事故">
                 <el-option label="无事故" value="无事故"></el-option>
@@ -176,7 +179,7 @@
           })
       },
       savedata() {
-        if (this.Title == '新增近三年主要工程业绩') {
+        if (this.Title == '近三年主要工程业绩') {
           this.addPerformance()
         } else if (this.Title == '编辑近三年主要工程业绩') {
           this.editPerformance()
@@ -259,7 +262,7 @@
           .catch(() => {});
       },
       showDialog() {
-        this.Title = '新增近三年主要工程业绩'
+        this.Title = '近三年主要工程业绩'
         this.PerformanceForm.Id = 0
         this.PerformanceForm.SupplierCertId = this.SupplierCertId
         this.PerformanceForm.SupplierTypeCode = this.SupplierTypeCode

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

@@ -253,7 +253,7 @@
 
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
-              <span>拥有专利、专有技术及工法</span>
+              <span>专利及专有技术</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>
@@ -270,7 +270,7 @@
 
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
-              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <span>近三年省部级及以上获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
                 v-if="formDataCert.Status <= 0">添加</el-button>
             </div>