前:文案;排版等

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

@@ -2,19 +2,6 @@
   <div>
     <el-form class="formDataInfo" label-width="137px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
       <el-row>
-        <!--<el-col :span="8">
-          <el-form-item label="DEMO">
-            <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in wellNoOptions"
-                :key="item.Id"
-                :label="item.Value"
-                :value="item.Id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>-->
-
         <el-col :span="16">
           <el-form-item label="供方名称" prop="SupplierName">
             <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
@@ -36,7 +23,8 @@
             </el-input>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="单位关系">
             <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel" :disabled="this.formData.Status > '0'&&!appendStatus"
@@ -47,7 +35,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-        <el-form-item label="国家" prop="Country">
+          <el-form-item label="国家" prop="Country">
           <el-select v-model="formData.Country"
                      :disabled="!canUpdateSupplier"
                      filterable
@@ -62,7 +50,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-      </el-col>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="准入方式">
             <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
@@ -73,20 +61,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8"
-                v-if="this.formData.Status == '8'||appendStatus">
-          <el-form-item label="有效期">
-            <el-date-picker
-              v-model="formData.ApplyTime"
-              :disabled="this.formData.Status == '8'"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="选择有效期"
-              style="width: 100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="证件合一">
             <el-select v-model="formData.CredentialFlag" placeholder="请选择" :disabled="!canUpdateSupplier"  @change="showorhid"  style="width: 100%">
@@ -95,8 +71,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-
         <el-col :span="8">
           <el-form-item label="统一社会信用代码" prop="CommercialNo">
             <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!authUser || parseInt(authUser.Profile.IsCompanyUser) === 1 || (parseInt(authUser.Profile.IsCompanyUser) === 0 && formData.Id > 0 && formData.Status > 0)" placeholder="请输入"
@@ -104,7 +78,21 @@
             </el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8" v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <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="请输入"

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

@@ -46,8 +46,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8"
-                v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
+        <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
             <el-input v-model="formData.AccessCardNo"
                       :readonly="this.formData.Status != '7'"
@@ -56,7 +55,8 @@
             </el-input>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="供应商类型" prop="OperType">
             <el-select ref="OperType"
@@ -72,7 +72,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="单位关系">
             <el-select ref="SpecType"
@@ -90,27 +89,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="国家"
-                        prop="Country">
-            <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
-            </el-input>-->
-            <el-select v-model="formData.Country"
-                       :disabled="!canUpdateSupplier"
-                       filterable
-                       placeholder="请选择"
-                       style="width: 100%">
-              <el-option v-for="item in countryListOptions"
-                         :key="item.key"
-                         :label="item.value"
-                         :value="item.value">
-                <span style="float: left">{{ item.value }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item label="准入方式">
             <el-select ref="inStyle"
@@ -127,7 +105,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="中石油准入证编号">
             <el-input v-model="formData.PACNumber"
@@ -173,22 +152,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="8"
-                v-if="this.formData.Status == '8'||appendStatus">
-          <el-form-item label="有效期">
-            <el-date-picker
-              v-model="formData.ApplyTime"
-              :disabled="this.formData.Status == '8'"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="选择有效期"
-              style="width: 100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="证件类型">
             <el-select v-model="formData.CredentialFlag"
@@ -217,6 +182,22 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8"
+                v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="税务登记证编号"
                         prop="CountryTaxNo"
@@ -354,155 +335,152 @@
         </el-col>-->
       </el-row>
       <el-row>
-
-        <!--<el-col :span="8">
-          <el-form-item label="外地企业进津备案通知书">
-            <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
+        <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-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="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="SetupTime">
-              <!--<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-row>
-
-        <!--<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="行业类别名称">
-              <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"
-                        :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>
 
-          <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="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-row>
+        <el-col :span="8">
+          <el-form-item label="成立时间" prop="SetupTime">
+            <!--<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-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-row>
+        <el-col :span="8">
+          <el-form-item label="国家"
+                        prop="Country">
+            <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            </el-input>-->
+            <el-select v-model="formData.Country"
+                       :disabled="!canUpdateSupplier"
+                       filterable
+                       placeholder="请选择"
+                       style="width: 100%">
+              <el-option v-for="item in countryListOptions"
+                         :key="item.key"
+                         :label="item.value"
+                         :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+              </el-option>
+            </el-select>
+          </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="币种">
+            <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="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="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="RegCapital">
+            <el-input type="number"
+                      v-model="formData.RegCapital"
+                      :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="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-row>
+      <el-row>
+        <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="Telphone">
@@ -514,7 +492,6 @@
             </el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="8">
           <el-form-item label="传真"
                         prop="Fax">
@@ -525,7 +502,8 @@
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="财务电话"
                         prop="CompanyTel">
@@ -547,13 +525,6 @@
                       style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-
-        <!--<el-col :span="8">
-          <el-form-item label="QQ号码">
-            <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>-->
-
         <el-col :span="8">
           <el-form-item label="银行信用等级">
             <el-input v-model="formData.BankCreditRating"
@@ -564,18 +535,8 @@
             </el-input>
           </el-form-item>
         </el-col>
-
-        <!--<el-col :span="8">
-          <el-form-item label="公司网址">
-            <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
-          </el-form-item>
-        </el-col>-->
-        <!--<el-col :span="8">
-          <el-form-item label="级别" >
-            <el-input v-model="formData.Level" maxlength="255" placeholder="请输入" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>-->
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="HSE审查培训">
             <el-select v-model="formData.HseTraining"
@@ -589,10 +550,8 @@
                          style="width: 100%">
               </el-option>
             </el-select>
-
           </el-form-item>
         </el-col>
-
       </el-row>
     </el-form>
 

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

@@ -34,7 +34,8 @@
             </el-input>
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="单位关系">
             <el-select ref="SpecType" v-model="formData.SpecTypeCode"  @change="currentSel"
@@ -74,21 +75,8 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="8"
-                v-if="this.formData.Status == '8'||appendStatus">
-          <el-form-item label="有效期">
-            <el-date-picker
-              v-model="formData.ApplyTime"
-              :disabled="this.formData.Status == '8'"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="选择有效期"
-              style="width: 100%">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+      </el-row>
+      <el-row>
 
         <el-col :span="8">
            <el-form-item label="证件合一">
@@ -105,7 +93,21 @@
             </el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8" v-if="this.formData.Status == '8'||appendStatus">
+          <el-form-item label="有效期">
+            <el-date-picker
+              v-model="formData.ApplyTime"
+              :disabled="this.formData.Status == '8'"
+              type="date"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              placeholder="选择有效期"
+              style="width: 100%">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
         <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%">

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/index.vue

@@ -117,7 +117,7 @@
         <!--  </template>-->
         <!--</el-table-column>-->
 
-        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center" >
+        <el-table-column show-overflow-tooltip label="评价内容及得分" header-align="center" >
           <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目组织实施(10分)" min-width="155" align="center"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="项目质量管理(20分)" min-width="160" align="center"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="项目职业健康安全与环境管理(20分)" min-width="255" align="center"></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/index.vue

@@ -68,7 +68,7 @@
         <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
         <!--  </template>-->
         <!--</el-table-column>-->
-        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
+        <el-table-column show-overflow-tooltip label="评价内容及得分" header-align="center">
           <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="产品质量(30分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="技术水平(20分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score3" align="center" header-align="center" label="服务能力(20分)" width="140"></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/index.vue

@@ -69,7 +69,7 @@
         <!--    {{evaluateFun(scope.row.Evaluate,scope.row.Result)}}-->
         <!--  </template>-->
         <!--</el-table-column>-->
-        <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
+        <el-table-column show-overflow-tooltip label="评价内容及得分" header-align="center">
           <el-table-column sortable show-overflow-tooltip prop="Score1" align="center" header-align="center" label="项目管理(40分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" align="center" header-align="center" label="HSE管理(30分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score3" align="center" header-align="center" label="合同履行(15分)" width="140"></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -73,11 +73,11 @@
         <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ jstimehandle(scope.row.ApplyTime+'') }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.CreateOn+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -100,12 +100,12 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyTime+'') }}
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"-->
+<!--            show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ jstimehandle(scope.row.ApplyTime+'') }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column prop="CreateOn" sortable width="110" label="申请日期" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.CreateOn+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -100,12 +100,12 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyTime+'') }}
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"-->
+<!--            show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ jstimehandle(scope.row.ApplyTime+'') }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column prop="CreateOn" sortable width="110" label="申请日期" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.CreateOn+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -99,12 +99,12 @@
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
 
-          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyTime+'') }}
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"-->
+<!--            show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ jstimehandle(scope.row.ApplyTime+'') }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column prop="CreateOn" sortable width="110" label="申请日期" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.CreateOn+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -99,12 +99,12 @@
           </el-table-column>
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyTime+'') }}
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="ApplyTime" sortable width="140" label="年审到期日期" align="center"-->
+<!--            show-overflow-tooltip>-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ jstimehandle(scope.row.ApplyTime+'') }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column prop="CreateOn" sortable width="110" label="申请日期" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.CreateOn+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -18,7 +18,7 @@
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="companySubmitApplyBtn"
-            v-if="(InfoStatus == '' || InfoStatus <= 0) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+            v-if="(InfoStatus == '' || InfoStatus <= 0) && !butnab && authUser.Profile.IsCompanyUser == 1">提交
           </el-button>
           <el-button type="primary" size="mini" @click="separateUnitSubmitApplyBtn"
                      v-if="(InfoStatus == '' || InfoStatus <= 0) && authUser.Profile.IsCompanyUser == 0 ">提交申请