不良行为添加 高级查询添加 有效期字段添加

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

@@ -77,6 +77,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Wzstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Wzstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -93,6 +95,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Jjstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Jjstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -109,6 +113,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Jfstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Jfstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -744,6 +750,10 @@ export default {
         value: '2',
         label: '暂停',
         style: 'color:#E6A23C'
+      }, {
+        value: '3',
+        label: '取消',
+        style: 'color:#F56C6C'
       }],
       companyChooseName: '',
       certChooseName: '',

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

@@ -28,7 +28,7 @@
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
-                <!--<el-dropdown-item command="search">高级查询</el-dropdown-item>-->
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -84,6 +84,212 @@
       </el-pagination>
     </el-card>
 
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+          <el-form ref="advancedsearchForm" label-width="130px">
+        <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.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" 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="12">
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable 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="12">
+            <el-form-item label="成立时间">
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" 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>
 <!--
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
@@ -468,6 +674,14 @@
         dialogVisible: false,
         // 列表数据
         entityList: [],
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -481,8 +695,38 @@
         CreateOn: [],
         // 查询项
         searchFormReset: {},
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         searchForm: {
-          SupplierTypeName: ''
+          SupplierTypeName: '',
+          SupplierName: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
+          City: '',
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:''
           // Id: '',
           // SupplierName: '',
           // OilCertificateNo: '',
@@ -915,7 +1159,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
     //查询列表
     this.initDatas()
-    //this.getDictOptions()
+    this.getDictOptions()
   },
 
     methods: {
@@ -949,15 +1193,49 @@
         })
       },
 
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          // this.dictOptions.customerList = res.data.items['customerList']
-          // this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
         })
       },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
+      getCityList (val) {
+        let resultData = JSON.parse(val)
+        let countstr = JSON.stringify(resultData.districts[0].districts)
+        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+        this.countryoptions = JSON.parse(countstr)
+      },
+      handleAreaChange (value) {
+      this.searchForm.Province = value[0]
+      this.searchForm.City = value[1]
+      this.searchForm.Street = value[2]
+      },
+      handleLinkAreaChange (value) {
+      this.searchForm.LinkProvince = value[0]
+      this.searchForm.LinkCity = value[1]
+      this.searchForm.LinkStreet = value[2]
+      },
 
       // 列表打印导出功能
       exportExcel () {
@@ -1003,10 +1281,12 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch () {
-        Object.assign(this.searchForm, this.searchFormReset)
-      // this.searchForm = this.searchFormReset
-      this.CreateOn = ''
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CityAry = []
+        this.LinkCityAry=[]
+        this.CreateOn = ''
         this.initDatas()
       },
       handleSearch () {

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

@@ -28,7 +28,7 @@
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
-                <!--<el-dropdown-item command="search">高级查询</el-dropdown-item>-->
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -74,368 +74,212 @@
       </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>
-    -->
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="130px">
+        <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.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" 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="12">
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable 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="12">
+            <el-form-item label="成立时间">
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" 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>
@@ -458,6 +302,14 @@
         dialogVisible: false,
         // 列表数据
         entityList: [],
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -471,8 +323,38 @@
         CreateOn: [],
         // 查询项
         searchFormReset: {},
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         searchForm: {
-          SupplierTypeName: ''
+          SupplierTypeName: '',
+          SupplierName: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
+          City: '',
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:''
         },
         tableColumns: [
 
@@ -848,7 +730,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
       this.initDatas()
-    // this.getDictOptions()
+    this.getDictOptions()
   },
 
     methods: {
@@ -917,15 +799,49 @@
         }
         return wbout
       },
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          // this.dictOptions.customerList = res.data.items['customerList']
-          // this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
         })
       },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
+    getCityList (val) {
+      let resultData = JSON.parse(val)
+      let countstr = JSON.stringify(resultData.districts[0].districts)
+      countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+      this.countryoptions = JSON.parse(countstr)
+    },
+    handleAreaChange (value) {
+    this.searchForm.Province = value[0]
+    this.searchForm.City = value[1]
+    this.searchForm.Street = value[2]
+    },
+    handleLinkAreaChange (value) {
+    this.searchForm.LinkProvince = value[0]
+    this.searchForm.LinkCity = value[1]
+    this.searchForm.LinkStreet = value[2]
+    },
 
       searchCommand (command) {
         if (command === 'search') {
@@ -944,9 +860,11 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch () {
-        Object.assign(this.searchForm, this.searchFormReset)
-        // this.searchForm = this.searchFormReset
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CityAry = []
+        this.LinkCityAry=[]
         this.CreateOn = ''
         this.initDatas()
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -56,7 +56,14 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope" >
+            <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+            <span v-else>{{ scope.row[column.prop] }}</span>
+          </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -678,6 +685,12 @@ import certApi from '@/api/oilsupplier/suppliercert'
             width: 220,
             sort: true
           },
+          {
+            prop: 'ApplyTime',
+            label: '有效期',
+            width: 220,
+            sort: true
+          },
 
           // {
           //   prop: 'QQ',
@@ -868,7 +881,7 @@ import certApi from '@/api/oilsupplier/suppliercert'
       jstimehandle (val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00+00:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -56,7 +56,14 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope" >
+            <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+            <span v-else>{{ scope.row[column.prop] }}</span>
+          </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -487,6 +494,12 @@
             width: 220,
             sort: true
           },
+          {
+            prop: 'ApplyTime',
+            label: '有效期',
+            width: 220,
+            sort: true
+          },
 
           // {
           //   prop: 'QQ',
@@ -654,7 +667,7 @@
       jstimehandle (val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00+00:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

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

@@ -28,7 +28,7 @@
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
-                <!--<el-dropdown-item command="search">高级查询</el-dropdown-item>-->
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -71,6 +71,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
             <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
@@ -80,7 +81,212 @@
                      :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
+        <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+          <el-form ref="advancedsearchForm" label-width="130px">
+        <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.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="12">
+          <el-form-item label="供应商类型">
+            <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="单位关系">
+            <el-select size="mini" v-model="searchForm.SpecTypeCode" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+       <el-col :span="12">
+          <el-form-item label="国家">
+            <el-select  size="mini" v-model="searchForm.Country" 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="12">
+          <el-form-item label="准入方式">
+            <el-select size="mini"  v-model="searchForm.InStyle" placeholder="请选择" style="width: 100%">
+              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="管理单位" >
+            <el-select size="mini" filterable v-model="searchForm.MgrUnit" maxlength="255"  clearable placeholder="请输入" style="width: 100%">
+            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                         :value="item.Key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="中石油准入证编号" >
+            <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
 
+        <el-col :span="12">
+          <el-form-item label="统一社会信用代码">
+            <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="注册地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="CityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.Address"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+         <el-col :span="24">
+            <el-form-item label="通信地址">
+              <el-row>
+                <el-col :span="10">
+                  <el-cascader
+                    :change-on-select="true"
+                    v-model="LinkCityAry"
+                    size="mini"
+                    :options="countryoptions"
+                    :props="countryprops"
+                    maxlength="100"
+                    placeholder="省市区"
+                    style="width: 100%"
+                    @change="handleLinkAreaChange"
+                  ></el-cascader>
+                </el-col>
+                <el-col :span="14">
+                  <el-input
+                    size="mini"
+                    v-model="searchForm.LinkAddress"
+                    maxlength="500"
+                    placeholder="详细地址"
+                    style="width: 100%"
+                  ></el-input>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="法人">
+              <el-input size="mini" v-model="searchForm.LegalPerson" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人">
+              <el-input size="mini" v-model="searchForm.ContactName" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="公司类型" prop="CompanyType" >
+              <el-select size="mini" v-model="searchForm.CompanyType" maxlength="50" filterable 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="12">
+            <el-form-item label="成立时间">
+              <el-date-picker
+                v-model="searchForm.SetupTime"
+                size="mini"
+                type="date"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        <el-col>
+          <el-form-item label="注册资本（万元）">
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital1" placeholder="请输入内容"></el-input>
+            </el-col>
+            <el-col :span="1">
+              <span>&nbsp;~</span>
+            </el-col>
+            <el-col :span="5">
+              <el-input size="mini" v-model="searchForm.RegCapital2" placeholder="请输入内容"></el-input>
+            </el-col>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+            <el-form-item label="营业范围">
+              <el-input size="mini" v-model="searchForm.BusinessScope" 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>
@@ -102,6 +308,14 @@
         dialogVisible: false,
         // 列表数据
         entityList: [],
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -115,8 +329,38 @@
         CreateOn: [],
         // 查询项
         searchFormReset: {},
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         searchForm: {
-          SupplierTypeName: ''
+          SupplierTypeName: '',
+          SupplierName: '',
+          OperType:'',
+          SpecTypeCode:'',
+          Country:'',
+          InStyle:'',
+          MgrUnit:'',
+          PACNumber:'',
+          CommercialNo:'',
+          Province:'',
+          City: '',
+          Street:'',
+          Address:'',
+          LinkProvince:'',
+          LinkCity:'',
+          LinkStreet:'',
+          LinkAddress:'',
+          LegalPerson:'',
+          ContactName:'',
+          CompanyType:'',
+          SetupTime:'',
+          RegCapital1:'',
+          RegCapital2:'',
+          BusinessScope:''
         },
         tableColumns: [
 
@@ -441,6 +685,12 @@
             width: 220,
             sort: true
           },
+          {
+            prop: 'ApplyTime',
+            label: '有效期',
+            width: 220,
+            sort: true
+          },
 
           // {
           //   prop: 'QQ',
@@ -492,7 +742,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
       this.initDatas()
-    // this.getDictOptions()
+    this.getDictOptions()
   },
 
     methods: {
@@ -561,15 +811,49 @@
         }
         return wbout
       },
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
-          // this.dictOptions.customerList = res.data.items['customerList']
-          // this.dictOptions.projectList = res.data.items['projectList']
+           this.dictData = res.data.items
+           this.OperTypeOptions = this.dictData['OperType']
+           this.UnitRelationOptions = this.dictData['UnitRelation']
+           this.InOptions = this.dictData['InOptions']
+           this.CompanyTypeOptions = this.dictData['CompanyType']
+           this.getCountryList(this.dictData['CountryList'])
+           this.ManagementUnitOptions=this.dictData['ManagementUnit']
+           this.getCityList(this.dictData['GaodeMapChinaAreas'])
 
         }).catch(err => {
           console.error(err)
         })
       },
+      getCountryList (val) {
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
+      getCityList (val) {
+        let resultData = JSON.parse(val)
+        let countstr = JSON.stringify(resultData.districts[0].districts)
+        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+        this.countryoptions = JSON.parse(countstr)
+      },
+      handleAreaChange (value) {
+      this.searchForm.Province = value[0]
+      this.searchForm.City = value[1]
+      this.searchForm.Street = value[2]
+      },
+      handleLinkAreaChange (value) {
+      this.searchForm.LinkProvince = value[0]
+      this.searchForm.LinkCity = value[1]
+      this.searchForm.LinkStreet = value[2]
+      },
 
       searchCommand (command) {
         if (command === 'search') {
@@ -588,9 +872,11 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch () {
-        Object.assign(this.searchForm, this.searchFormReset)
-        // this.searchForm = this.searchFormReset
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CityAry = []
+        this.LinkCityAry=[]
         this.CreateOn = ''
         this.initDatas()
       },
@@ -631,7 +917,7 @@
       jstimehandle (val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00+00:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -56,7 +56,14 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
+                         v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope" >
+            <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-else-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
+            <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+            <span v-else>{{ scope.row[column.prop] }}</span>
+          </template>
+        </el-table-column>
 
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -679,6 +686,12 @@
             width: 220,
             sort: true
           },
+          {
+            prop: 'ApplyTime',
+            label: '有效期',
+            width: 220,
+            sort: true
+          },
 
           // {
           //   prop: "QQ",
@@ -884,7 +897,7 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00+00:00') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

src/dashoo.cn/frontend_web/src/pages/select/badrecordselect/index.vue

@@ -86,6 +86,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Wzstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Wzstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -102,6 +104,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Jjstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Jjstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -118,6 +122,8 @@
                   style="color:#67C23A">准入</span>
             <span v-else-if="scope.row.Jfstatus=='2'"
                   style="color:#E6A23C">暂停</span>
+            <span v-else-if="scope.row.Jfstatus=='3'"
+                  style="color:#F56C6C">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -861,6 +867,10 @@ export default {
         value: '2',
         label: '暂停',
         style: 'color:#E6A23C'
+      }, {
+        value: '3',
+        label: '取消',
+        style: 'color:#F56C6C'
       }],
       companyChooseName: '',
       certChooseName: '',