2
3
lining 6 роки тому
батько
коміт
ccc947aeb5

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -939,7 +939,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)

+ 124 - 167
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -102,12 +102,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="企业名称">
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
@@ -115,70 +109,71 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="中石油供应商证书号">
-              <el-input size="mini" v-model="searchForm.OilCertificateNo" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="工商注册号">
+              <el-input size="mini" v-model="searchForm.CommercialNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="级别">
-              <el-input size="mini" v-model="searchForm.Grade" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="组织机构代码">
+              <el-input size="mini" v-model="searchForm.OrganCode" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="管理单位">
-              <el-input size="mini" v-model="searchForm.MgrUnit" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="税务登记证国税编号">
+              <el-input size="mini" v-model="searchForm.CountryTaxNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="经营方式">
-              <el-input size="mini" v-model="searchForm.OperType" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="税务登记证地税编号">
+              <el-input size="mini" v-model="searchForm.LocalTaxNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="国家">
-              <el-input size="mini" v-model="searchForm.Country" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="中石油供应商证书号" label-width="130px">
+              <el-input size="mini" v-model="searchForm.OilCertificateNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="所代理制造商名称">
-              <el-input size="mini" v-model="searchForm.MaunAgent" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="级别">
+              <el-input size="mini" v-model="searchForm.Grade" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="管理单位">
+              <el-input size="mini" v-model="searchForm.MgrUnit" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="工商注册号">
-              <el-input size="mini" v-model="searchForm.CommercialNo" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="单位关系">
+              <el-input size="mini" v-model="searchForm.SpecTypeCode" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="组织机构代码">
-              <el-input size="mini" v-model="searchForm.OrganCode" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="供应商类型">
+              <el-input size="mini" v-model="searchForm.OperType" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="税务登记证国税编号">
-              <el-input size="mini" v-model="searchForm.CountryTaxNo" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="国家">
+              <el-input size="mini" v-model="searchForm.Country" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="税务登记证地税编号">
-              <el-input size="mini" v-model="searchForm.LocalTaxNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="施工队伍名称">-->
+              <!--<el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
 
           <el-col :span="12">
             <el-form-item label="单位地址">
@@ -216,78 +211,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="质量管理体系认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.QualitySystemCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="产品质量认证情况及认证机构">
-              <el-input size="mini" v-model="searchForm.ProductQualityCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="生产制造许可证获证情况及编号">
-              <el-input size="mini" v-model="searchForm.MaunLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书编号">
-              <el-input size="mini" v-model="searchForm.QualifCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="企业资质证书级别">
-              <el-input size="mini" v-model="searchForm.QualifCertLevel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="安全生产许可证">
-              <el-input size="mini" v-model="searchForm.SafetyLicense" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="技术服务类准入许可证">
-              <el-input size="mini" v-model="searchForm.TechServiceLic" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="外地企业进津备案通知书">
-              <el-input size="mini" v-model="searchForm.TJInNotify" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业特殊要求的认证证书">
-              <el-input size="mini" v-model="searchForm.SpecIndustryCert" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="法定代表人姓名">
               <el-input size="mini" v-model="searchForm.LegalPerson" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="行业类别代码">
-              <el-input size="mini" v-model="searchForm.CategoryCode" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="行业类别名称">
-              <el-input size="mini" v-model="searchForm.CategoryName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="注册资本">
               <el-input size="mini" v-model="searchForm.RegCapital" style="width:100%" placeholder="请输入"></el-input>
@@ -331,20 +260,8 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input size="mini" v-model="searchForm.EMail" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="银行信用等级">
-              <el-input size="mini" v-model="searchForm.BankCreditRating" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="移动电话">
-              <el-input size="mini" v-model="searchForm.Mobile" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="财务电话">
+              <el-input size="mini" v-model="searchForm.CompanyTel" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
@@ -360,87 +277,127 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="公司电话">
-              <el-input size="mini" v-model="searchForm.CompanyTel" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="QQ号码">
-              <el-input size="mini" v-model="searchForm.QQ" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="公司网址">
-              <el-input size="mini" v-model="searchForm.CompanyUrl" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="是否特殊业务供应商(可不招标)">
-              <el-input size="mini" v-model="searchForm.SpecSupplier" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="电子邮箱">-->
+              <!--<el-input size="mini" v-model="searchForm.EMail" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
-            <el-form-item label="业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)">
-              <el-input size="mini" v-model="searchForm.SpecTypeCode" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="银行信用等级">
+              <el-input size="mini" v-model="searchForm.BankCreditRating" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)">
-              <el-input size="mini" v-model="searchForm.SpecTypeName" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="24">
+            <el-form-item label="质量管理体系认证情况及认证机构">
+              <el-input size="mini" v-model="searchForm.QualitySystemCert" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="24">
+            <el-form-item label="产品质量认证情况及认证机构">
+              <el-input size="mini" v-model="searchForm.ProductQualityCert" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="删除状态,0正常,1已删除">
-              <el-input size="mini" v-model="searchForm.IsDelete" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="24">
+            <el-form-item label="生产/制造许可证获证情况及编号">
+              <el-input size="mini" v-model="searchForm.MaunLicense" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateOn" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="所代理制造商名称">
+              <el-input size="mini" v-model="searchForm.MaunAgent" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+            <!--<el-form-item label="企业资质证书编号">-->
+              <!--<el-input size="mini" v-model="searchForm.QualifCert" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.CreateBy" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="企业资质证书级别">-->
+              <!--<el-input size="mini" v-model="searchForm.QualifCertLevel" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedOn" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="安全生产许可证">
+              <el-input size="mini" v-model="searchForm.SafetyLicense" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedUserId" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="技术服务类准入许可证">-->
+              <!--<el-input size="mini" v-model="searchForm.TechServiceLic" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="外地企业进津备案通知书">-->
+              <!--<el-input size="mini" v-model="searchForm.TJInNotify" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="行业特殊要求的认证证书">-->
+              <!--<el-input size="mini" v-model="searchForm.SpecIndustryCert" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="行业类别代码">-->
+              <!--<el-input size="mini" v-model="searchForm.CategoryCode" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="行业类别名称">-->
+              <!--<el-input size="mini" v-model="searchForm.CategoryName" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="移动电话">-->
+              <!--<el-input size="mini" v-model="searchForm.Mobile" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="QQ号码">-->
+              <!--<el-input size="mini" v-model="searchForm.QQ" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="公司网址">-->
+              <!--<el-input size="mini" v-model="searchForm.CompanyUrl" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="是否特殊业务供应商(可不招标)">-->
+              <!--<el-input size="mini" v-model="searchForm.SpecSupplier" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!---->
+
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)">-->
+              <!--<el-input size="mini" v-model="searchForm.SpecTypeName" style="width:100%" placeholder="请输入"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
           <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="备注">
+              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
@@ -937,7 +894,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -948,7 +948,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn.length == 2) {
+        if (this.CreateOn && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)