前三点

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

@@ -18,12 +18,12 @@
         <el-col :span="16">
           <el-form-item label="供方名称" prop="SupplierName">
             <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
-              :fetch-suggestions="querySearch" :maxlength="255" placeholder="请输入内容" style="width: 100%"
-              @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+                             :fetch-suggestions="querySearch" :maxlength="255" placeholder="请输入内容" style="width: 100%"
+                             @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-autocomplete>
             <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
-              :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
-              v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+                      :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
+                      v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
             </el-input>
           </el-form-item>
         </el-col>
@@ -38,7 +38,7 @@
         <el-col :span="8">
           <el-form-item label="单位关系">
             <el-select ref="SpecType" v-model="formData.SpecTypeCode" :disabled="!canUpdateSupplier"
-               placeholder="请选择" style="width: 100%">
+                       placeholder="请选择" style="width: 100%">
               <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
             </el-select>
@@ -55,8 +55,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-          <el-col :span="8">
-           <el-form-item label="证件合一">
+        <el-col :span="8">
+          <el-form-item label="证件合一">
             <el-select v-model="formData.CredentialFlag" placeholder="请选择"  @change="showorhid"  style="width: 100%">
               <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
@@ -68,7 +68,7 @@
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo">
             <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -76,7 +76,7 @@
         <el-col :span="8">
           <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
             <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -84,12 +84,12 @@
         <el-col :span="8">
           <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
             <el-input v-model="formData.OrganCode" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
-        </el-row>
-        <el-row>
+      </el-row>
+      <el-row>
         <!--<el-col :span="8">
           <el-form-item label="税务登记证地税编号">
             <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
@@ -100,12 +100,12 @@
             <el-row>
               <el-col :span="10">
                 <el-cascader :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
-                  :readonly="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%"
-                  @change="handleAreaChange"></el-cascader>
+                             :readonly="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%"
+                             @change="handleAreaChange"></el-cascader>
               </el-col>
               <el-col :span="14">
                 <el-input v-model="formData.Address" props="Address" maxlength="500" :readonly="!canUpdateSupplier"
-                  placeholder="详细地址" style="width: 100%">
+                          placeholder="详细地址" style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
@@ -114,7 +114,7 @@
         <el-col :span="8">
           <el-form-item label="邮编" prop="ZipCode">
             <el-input v-model="formData.ZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -124,13 +124,13 @@
             <el-row>
               <el-col :span="10">
                 <el-cascader :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
-                  placeholder="省市区" v-model="LinkCityAry" style="width: 100%"
-                  @change="handleLinkAreaChange">
+                             placeholder="省市区" v-model="LinkCityAry" style="width: 100%"
+                             @change="handleLinkAreaChange">
                 </el-cascader>
               </el-col>
               <el-col :span="14">
                 <el-input v-model="formData.LinkAddress" props="LinkAddress" maxlength="500" placeholder="详细地址"
-                  style="width: 100%">
+                          style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
@@ -139,7 +139,7 @@
         <el-col :span="8">
           <el-form-item label="邮编" prop="LinkZipCode">
             <el-input v-model="formData.LinkZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -184,7 +184,7 @@
         <el-col :span="8">
           <el-form-item label="法定代表人姓名" prop="LegalPerson">
             <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -193,14 +193,24 @@
           <el-form-item label="公司类型" prop="CompanyType">
             <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
             <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
-              :disabled="!canUpdateSupplier" placeholder="请选择" style="width: 100%;">
+                       :disabled="!canUpdateSupplier" placeholder="请选择" style="width: 100%;">
               <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
-                style="width: 100%">
+                         style="width: 100%">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="成立时间">
+            <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
+              style="width: 100%"> </el-date>-->
+            <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier"
+                            format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+
         <!--<el-col :span="8">
           <el-form-item label="行业类别">
             <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
@@ -212,71 +222,64 @@
             <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
           </el-form-item>
         </el-col>-->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="注册资本" prop="RegCapital">
+              <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier"
+                        placeholder="请输入" style="width: 100%">
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="注册资本" prop="RegCapital">
-            <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier"
-              placeholder="请输入" style="width: 100%">
-              <template slot="append">万元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="币种">
-            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="成立时间">
-            <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
-              style="width: 100%"> </el-date>-->
-            <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier"
-              format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种">
+              <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="开户银行" prop="DepositBank">
-            <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="开户银行" prop="DepositBank">
+              <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+                        style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="联系人姓名" prop="ContactName">
+              <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                        style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="银行账号" prop="BankAccount">
-            <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="移动电话" prop="Mobile">
+              <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                        style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="联系人姓名" prop="ContactName">
-            <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="银行账号" prop="BankAccount">
+              <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+                        style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <el-col :span="8">
-          <el-form-item label="移动电话" prop="Mobile">
-            <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone">
             <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -284,21 +287,21 @@
         <el-col :span="8">
           <el-form-item label="传真" prop="Fax">
             <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%"></el-input>
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="财务电话" prop="CompanyTel">
             <el-input v-model="formData.CompanyTel" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="20"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="电子邮箱" prop="EMail">
             <el-input v-model="formData.EMail" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
-              style="width: 100%"></el-input>
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
@@ -311,7 +314,7 @@
         <el-col :span="8">
           <el-form-item label="银行信用等级">
             <el-input v-model="formData.BankCreditRating" maxlength="10" :readonly="!canUpdateSupplier"
-              placeholder="请输入" style="width: 100%">
+                      placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -330,9 +333,9 @@
           <el-form-item label="HSE审查培训">
             <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
             <el-select v-model="formData.HseTraining" :readonly="!canUpdateSupplier" placeholder="请选择"
-              style="width: 100%;">
+                       style="width: 100%;">
               <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                style="width: 100%">
+                         style="width: 100%">
               </el-option>
             </el-select>
 
@@ -346,13 +349,13 @@
         <el-col :span="8">
           <el-form-item label="质量管理体系认证情况">
             <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea"
-              style="width: 100%"></el-input>
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="企业资质证书(编号  级别)">
             <el-input v-model="formData.QualifCert" placeholder="请输入" maxlength="200" type="textarea"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -364,7 +367,7 @@
         <el-col :span="8">
           <el-form-item label="安全生产许可证">
             <el-input v-model="formData.SafetyLicense" maxlength="200" placeholder="请输入" type="textarea"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -372,14 +375,14 @@
         <el-col :span="8">
           <el-form-item label="行业特殊要求的认证证书">
             <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" maxlength="200" type="textarea"
-              style="width: 100%">
+                      style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="16">
           <el-form-item label="营业范围" prop="BusinessScope">
             <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
-              style="width: 100%"></el-input>
+                      style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -421,22 +424,22 @@
     },
 
     data() {
-  var checkemail= (rule, value, callback) => {
+      var checkemail= (rule, value, callback) => {
         console.log(value)
-          if (value) {
-            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()
-            }
-          }
-          else{
+        if (value) {
+          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()
           }
-        };
-        var checkCommercialNo =  (rule, value, callback) => {
-         console.log("showorhidflag"+this.showorhidflag)
+        }
+        else{
+          callback()
+        }
+      };
+      var checkCommercialNo =  (rule, value, callback) => {
+        console.log("showorhidflag"+this.showorhidflag)
         if (!value) {
           callback(new Error('请输入统一社会信用代码'));
         } else {
@@ -462,49 +465,49 @@
           callback();
         }
       };
-       //检查邮编格式
+      //检查邮编格式
       var checkZipCode =  (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入邮编'));
         } else {
           let re = /^[1-9]\d{5}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的邮编'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮编'))
+          } else {
+            callback()
+          }
         }
       };
       //检查手机号
-       var checkMobile =  (rule, value, callback) => {
+      var checkMobile =  (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入手机号码'));
         } else {
           let re = /^1[3456789]\d{9}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的手机号码'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的手机号码'))
+          } else {
+            callback()
+          }
         }
       };
 
-        //固话检验
-       var checkTelphone =  (rule, value, callback) => {
+      //固话检验
+      var checkTelphone =  (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入固话号码'));
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的固话格式为：0000-0000000'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的固话格式为：0000-0000000'))
+          } else {
+            callback()
+          }
         }
       };
       return {
-         showorhidflag:'hid',
-         selectoptions: [{
+        showorhidflag:'hid',
+        selectoptions: [{
           value: '1',
           label: '三证合一'
         }, {
@@ -539,7 +542,7 @@
 
         rulesform: {
           BusinessScope:[{
-          required: true,
+            required: true,
             message: '请输入营业范围',
             trigger: 'change'
           }],
@@ -579,10 +582,10 @@
             trigger: 'change'
           }, ],
           EMail: [{
-              required: false,
-              validator: checkemail,
-              trigger: 'change'
-            }],
+            required: false,
+            validator: checkemail,
+            trigger: 'change'
+          }],
           OrganCode: [{
             required: true,
             message: '请输入组织机构代码',
@@ -617,7 +620,7 @@
 
           Telphone: [{
             required: true,
-             validator: checkTelphone,
+            validator: checkTelphone,
             trigger: 'change'
           }, ],
           CompanyTel: [{
@@ -663,14 +666,14 @@
       }
     },
     methods: {
-         showorhid(val){
-          console.log(val)
-          if(val=='1'||val=='2'){
-            this.showorhidflag='hid'
-          }
-          else{
-             this.showorhidflag='show'
-          }
+      showorhid(val){
+        console.log(val)
+        if(val=='1'||val=='2'){
+          this.showorhidflag='hid'
+        }
+        else{
+          this.showorhidflag='show'
+        }
       },
       // commnoChange () {
       //   this.formData.CountryTaxNo = this.formData.CommercialNo

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

@@ -9,7 +9,7 @@
             :disabled="!canadd">删除</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="MainEquipment" label="项目名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="MainEquipment" label="设备名称" show-overflow-tooltip></el-table-column>
       <el-table-column prop="Specifications" label="规格型号" show-overflow-tooltip></el-table-column>
       <el-table-column prop="Number" label="数量" show-overflow-tooltip></el-table-column>
       <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
@@ -23,7 +23,7 @@
       <el-form ref="refPerformance" :model="EquipmentForm" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="项目名称">
+            <el-form-item label="设备名称">
               <el-input v-model="EquipmentForm.MainEquipment"></el-input>
             </el-form-item>
           </el-col>

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

@@ -217,92 +217,99 @@
             <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
           </el-form-item>
         </el-col>-->
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="法定代表人姓名" prop="LegalPerson" >
+              <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="法定代表人姓名" prop="LegalPerson" >
-            <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
+              <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create :disabled="!canUpdateSupplier" placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="公司类型" prop="CompanyType" >
-            <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
-            <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create :disabled="!canUpdateSupplier" placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
-                         style="width: 100%">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="成立时间">
+              <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
+                style="width: 100%"> </el-date>-->
+              <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier" format="yyyy 年 MM 月 dd 日"
+                              value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 
-        <!--<el-col :span="8">
-          <el-form-item label="行业类别">
-            <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>-->
+        </el-row>
 
-        <!--<el-col :span="8">
-          <el-form-item label="行业类别名称">
-            <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>-->
+          <!--<el-col :span="8">
+            <el-form-item label="行业类别">
+              <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>-->
 
-        <el-col :span="8">
-          <el-form-item label="注册资本" prop="RegCapital" >
-            <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-              <template slot="append">万元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <!--<el-col :span="8">
+            <el-form-item label="行业类别名称">
+              <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>-->
+        <el-row>
 
-        <el-col :span="8">
-          <el-form-item label="币种">
-            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="注册资本" prop="RegCapital" >
+              <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="成立时间">
-            <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
-              style="width: 100%"> </el-date>-->
-            <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier" format="yyyy 年 MM 月 dd 日"
-                            value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="币种">
+              <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="开户银行" prop="DepositBank" >
-            <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="开户银行" prop="DepositBank" >
+              <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="银行账号" prop="BankAccount" >
-            <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+        </el-row>
 
-        <el-col :span="8">
-          <el-form-item label="联系人姓名" prop="ContactName">
-            <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="联系人姓名" prop="ContactName">
+              <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="移动电话" prop="Mobile" >
-            <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
+          <el-col :span="8">
+            <el-form-item label="移动电话" prop="Mobile" >
+              <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="银行账号" prop="BankAccount" >
+              <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone" >
@@ -311,6 +318,7 @@
           </el-form-item>
         </el-col>
 
+
         <el-col :span="8">
           <el-form-item label="传真" prop="Fax" >
             <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
@@ -393,13 +401,13 @@
           </el-form-item>
         </el-col>
 
-         <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="中石油物资供应商证书" >
             <el-input v-model="formData.SupplierCertificate" maxlength="255" placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
-
+-->
         <!-- <el-col :span="8">
           <el-form-item label="企业资质证书(编号  级别)">
             <el-input v-model="formData.QualifCert" placeholder="请输入" maxlength="200" type="textarea"
@@ -427,13 +435,13 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="16">
+        <el-col :span="8">
           <el-form-item label="营业范围" prop="BusinessScope">
             <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="16">
           <el-form-item label="备注">
             <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea"
                       style="width: 100%">

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

@@ -9,7 +9,7 @@
             :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="StartTime" label="起始时间" show-overflow-tooltip>
@@ -39,7 +39,7 @@
       <el-form ref="refPerformance" :model="PerformanceForm" :rules="rules" 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>

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

@@ -210,24 +210,6 @@
           </el-form-item>
         </el-col>-->
 
-        <el-col :span="8">
-          <el-form-item label="注册资本" prop="RegCapital" >
-            <el-input type="number" :readonly="!canUpdateSupplier" v-model="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
-              <template slot="append">万元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="币种">
-            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
-                       style="width: 100%;">
-              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item label="成立时间">
             <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
@@ -238,32 +220,53 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="开户银行" prop="DepositBank" >
-            <el-input v-model="formData.DepositBank" :readonly="!canUpdateSupplier" maxlength="50" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="银行账号" prop="BankAccount" >
-            <el-input v-model="formData.BankAccount" :readonly="!canUpdateSupplier" maxlength="50" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="联系人姓名" prop="ContactName">
-            <el-input v-model="formData.ContactName" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="移动电话" prop="Mobile" >
-            <el-input v-model="formData.Mobile" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="注册资本" prop="RegCapital" >
+              <el-input type="number" :readonly="!canUpdateSupplier" v-model="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
+                <template slot="append">万元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="币种">
+              <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                         style="width: 100%;">
+                <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="开户银行" prop="DepositBank" >
+              <el-input v-model="formData.DepositBank" :readonly="!canUpdateSupplier" maxlength="50" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="联系人姓名" prop="ContactName">
+              <el-input v-model="formData.ContactName" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="移动电话" prop="Mobile" >
+              <el-input v-model="formData.Mobile" :readonly="!canUpdateSupplier" maxlength="20" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="银行账号" prop="BankAccount" >
+              <el-input v-model="formData.BankAccount" :readonly="!canUpdateSupplier" maxlength="50" placeholder="请输入" style="width: 100%">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-col :span="8">
           <el-form-item label="固定电话" prop="Telphone" >
@@ -323,6 +326,7 @@
 
       </el-row>
     </el-form>
+
     <el-form label-position="top" ref="EntityFormCert" :rules="rulesform"  :model="formData" :disabled="disabled">
     <el-row :gutter="60">
       <el-col :span="8">