lining 6 年 前
コミット
36f55fc08e

+ 3 - 3
src/dashoo.cn/backend/api/conf/app.conf

@@ -83,10 +83,10 @@ callbackHost=http://36dcae10.ngrok.io
 # AposeUrl=http://localhost:8080/acti-api/api/apose
 # BaseUrl=http://localhost:8080/acti-api/api/acti
 
-goodsModuleHost=http://weed1.labsop.cn:9390/1,2c23a61ef2ef
-basisModuleHost=http://weed1.labsop.cn:9390/2,2c25b72356e5
+goodsModuleHost=http://weed1.labsop.cn:9390/2,2c6dcbacc047
+basisModuleHost=http://weed1.labsop.cn:9390/2,2c780711e0c5
 techModuleHost=http://weed1.labsop.cn:9390/5,2c242309037d
-goodsPdfHost=http://weed1.labsop.cn:9390/3,2c46abdb949f
+goodsPdfHost=http://weed1.labsop.cn:9390/6,2c6c10c70aed
 basisPdfHost=http://weed1.labsop.cn:9390/6,2c592f01a6f8
 techPdfHost=http://weed1.labsop.cn:9390/1,2c58b7c861d3
 OriginUrl=http://47.92.212.59:8081/acti-api/api

+ 1 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -1311,6 +1311,7 @@ func (this *InfoChangeController) InfoAudit() {
 			cols := []string{
 				"Status",
 				"Step",
+				"WorkFlowId",
 			}
 			_, myerr := svc.UpdateEntityByIdCols(infoid, infomodel, cols)
 

+ 2 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -620,7 +620,7 @@
         <el-col :span="8">
           <el-form-item label="所代理制造商名称">
             <el-input v-model="formData.MaunAgent"
-                      maxlength="255"
+                      maxlength="100"
                       :readonly="this.formData.Status > '0'"
                       placeholder="请输入"
                       type="textarea">
@@ -674,7 +674,7 @@
           <el-form-item label="营业范围"
                         prop="BusinessScope">
             <el-input v-model="formData.BusinessScope"
-                      maxlength="200"
+                      maxlength="1000"
                       :readonly="!canUpdateSupplier"
                       placeholder="营业执照上的信息"
                       type="textarea"

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

@@ -44,7 +44,7 @@
             <router-link :to="'/oilsupplier/paymentinfo/' + scope.row.Id + '/operation'">
               <el-button type="primary" plain title="查看详情" size="mini">查看</el-button>
             </router-link>
-            <el-button type="danger" style="margin-left:10px" size="mini" @click="deleteEntity(scope.row)" v-if="isAllowDel">删除</el-button>
+            <el-button type="danger" style="margin-left:10px" size="mini" @click="deleteEntity(scope.row)" v-if="isAllowDel" disabled="true">删除</el-button>
             <!--<el-popover placement="top" title="提示" trigger="click" v-if="isAllowDel">-->
               <!--<el-alert title="" description="确认要删除吗?" type="warning" :closable="false">-->
               <!--</el-alert>-->

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

@@ -592,12 +592,12 @@ export default {
          sort: true
          }, */
 
-        {
-          prop: 'CountryTaxNo',
-          label: '税务登记证编号',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'CountryTaxNo',
+        //   label: '税务登记证编号',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
          prop: "LocalTaxNo",
@@ -823,19 +823,19 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'QQ',
-          label: 'QQ号码',
-          width: 220,
-          sort: true
-        },
-
-        {
-          prop: 'CompanyUrl',
-          label: '公司网址',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'QQ',
+        //   label: 'QQ号码',
+        //   width: 220,
+        //   sort: true
+        // },
+        //
+        // {
+        //   prop: 'CompanyUrl',
+        //   label: '公司网址',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
          prop: "SpecSupplier",

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

@@ -595,12 +595,12 @@ export default {
          sort: true
          }, */
 
-        {
-          prop: 'CountryTaxNo',
-          label: '税务登记证编号',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'CountryTaxNo',
+        //   label: '税务登记证编号',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
          prop: "LocalTaxNo",
@@ -826,19 +826,19 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'QQ',
-          label: 'QQ号码',
-          width: 220,
-          sort: true
-        },
-
-        {
-          prop: 'CompanyUrl',
-          label: '公司网址',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'QQ',
+        //   label: 'QQ号码',
+        //   width: 220,
+        //   sort: true
+        // },
+        //
+        // {
+        //   prop: 'CompanyUrl',
+        //   label: '公司网址',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
          prop: "SpecSupplier",

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

@@ -656,12 +656,12 @@
            sort: true
            },*/
 
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /*{
            prop: "LocalTaxNo",
@@ -887,19 +887,19 @@
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /*{
            prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -597,12 +597,12 @@ export default {
           sort: true
         }, */
 
-        {
-          prop: 'CountryTaxNo',
-          label: '税务登记证编号',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'CountryTaxNo',
+        //   label: '税务登记证编号',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
           prop: "LocalTaxNo",
@@ -828,19 +828,19 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'QQ',
-          label: 'QQ号码',
-          width: 220,
-          sort: true
-        },
-
-        {
-          prop: 'CompanyUrl',
-          label: '公司网址',
-          width: 220,
-          sort: true
-        },
+        // {
+        //   prop: 'QQ',
+        //   label: 'QQ号码',
+        //   width: 220,
+        //   sort: true
+        // },
+        //
+        // {
+        //   prop: 'CompanyUrl',
+        //   label: '公司网址',
+        //   width: 220,
+        //   sort: true
+        // },
 
         /* {
           prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/basislist.vue

@@ -437,12 +437,12 @@
            sort: true
            },*/
 
-          {
-            prop: "CountryTaxNo",
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: "CountryTaxNo",
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
 
           /*{
            prop: "LocalTaxNo",
@@ -668,19 +668,19 @@
             sort: true
           },
 
-          {
-            prop: "QQ",
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: "CompanyUrl",
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: "QQ",
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: "CompanyUrl",
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /*{
            prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/goodslist.vue

@@ -379,12 +379,12 @@
             width: 240,
             sort: true
           },
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
           {
             prop: 'Address',
             label: '单位地址',
@@ -482,19 +482,19 @@
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
           {
             prop: 'Remark',
             label: '备注',

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/index.vue

@@ -567,12 +567,12 @@
            sort: true
            }, */
 
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 260,
+          //   sort: true
+          // },
 
           /* {
            prop: "LocalTaxNo",
@@ -798,19 +798,19 @@
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /* {
            prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/techlist.vue

@@ -443,12 +443,12 @@
             sort: true
           },*/
 
-          {
-            prop: "CountryTaxNo",
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: "CountryTaxNo",
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
 
           /*{
             prop: "LocalTaxNo",
@@ -674,19 +674,19 @@
             sort: true
           },
 
-          {
-            prop: "QQ",
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: "CompanyUrl",
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: "QQ",
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: "CompanyUrl",
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /*{
             prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -448,12 +448,12 @@ import certApi from '@/api/oilsupplier/suppliercert'
            sort: true
            },*/
 
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
 
           /*{
            prop: "LocalTaxNo",
@@ -679,19 +679,19 @@ import certApi from '@/api/oilsupplier/suppliercert'
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /* {
            prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -385,12 +385,12 @@
             width: 240,
             sort: true
           },
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
           {
             prop: 'Address',
             label: '单位地址',
@@ -488,19 +488,19 @@
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
           {
             prop: 'Remark',
             label: '备注',

+ 19 - 382
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -81,369 +81,6 @@
       </el-pagination>
     </el-card>
 
-    <!--
-        <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-          <el-form ref="advancedsearchForm" label-width="110px">
-            <el-row>
-
-              <el-col :span="12">
-                <el-form-item label="生成时间">
-                  <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                                  start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-                </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>
-                </el-form-item>
-              </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>
-              </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>
-              </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>
-              </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>
-              </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>
-              </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>
-              </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="工商注册号">
-                  <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.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.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.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.Address" 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.Province" 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.City" 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.Street" 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.HouseNo" 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.ZipCode" 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.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>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="12">
-                <el-form-item label="币种">
-                  <el-input size="mini" v-model="searchForm.Currency" 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.ContactName" 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.CompanyType" 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.SetupTime" 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.DepositBank" 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.BankAccount" 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="银行信用等级">
-                  <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>
-              </el-col>
-
-              <el-col :span="12">
-                <el-form-item label="固定电话">
-                  <el-input size="mini" v-model="searchForm.Telphone" 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.Fax" 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.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="业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)">
-                  <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="业务类型(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.Remark" 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-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>
-              </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="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.ModifiedOn" 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.ModifiedBy" style="width:100%" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-
-            </el-row>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-            <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-          </span>
-        </el-dialog>
-    -->
-
   </div>
 </template>
 <script>
@@ -574,12 +211,12 @@
            sort: true
            }, */
 
-          {
-            prop: 'CountryTaxNo',
-            label: '税务登记证编号',
-            width: 260,
-            sort: true
-          },
+          // {
+          //   prop: 'CountryTaxNo',
+          //   label: '税务登记证编号',
+          //   width: 260,
+          //   sort: true
+          // },
 
           /* {
            prop: "LocalTaxNo",
@@ -805,19 +442,19 @@
             sort: true
           },
 
-          {
-            prop: 'QQ',
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: 'CompanyUrl',
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: 'QQ',
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: 'CompanyUrl',
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /* {
            prop: "SpecSupplier",

+ 19 - 19
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -449,12 +449,12 @@
             sort: true
           },*/
 
-          {
-            prop: "CountryTaxNo",
-            label: '税务登记证编号',
-            width: 240,
-            sort: true
-          },
+          // {
+          //   prop: "CountryTaxNo",
+          //   label: '税务登记证编号',
+          //   width: 240,
+          //   sort: true
+          // },
 
           /*{
             prop: "LocalTaxNo",
@@ -680,19 +680,19 @@
             sort: true
           },
 
-          {
-            prop: "QQ",
-            label: 'QQ号码',
-            width: 220,
-            sort: true
-          },
-
-          {
-            prop: "CompanyUrl",
-            label: '公司网址',
-            width: 220,
-            sort: true
-          },
+          // {
+          //   prop: "QQ",
+          //   label: 'QQ号码',
+          //   width: 220,
+          //   sort: true
+          // },
+          //
+          // {
+          //   prop: "CompanyUrl",
+          //   label: '公司网址',
+          //   width: 220,
+          //   sort: true
+          // },
 
           /*{
             prop: "SpecSupplier",

+ 2 - 0
src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -484,6 +484,8 @@
             return '未通过'
           case '10':
             return '待分办'
+          case '11':
+            return '审核完成'
           default:
             return val
         }