添加企业名称搜索

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 基建类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 物资类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -28,7 +31,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,6 +77,213 @@
       </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">
@@ -458,6 +668,14 @@
         dialogVisible: false,
         // 列表数据
         entityList: [],
+        countryoptions: [],
+        CityAry: [],
+        LinkCityAry:[],
+        countryprops: {
+        value: 'adcode',
+        label: 'name',
+        children: 'districts'
+        },
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -469,10 +687,41 @@
         },
         // 查询时间
         CreateOn: [],
+        searchFormReset: {},
+        OperTypeOptions:[],
+        UnitRelationOptions:[],
+        countryListOptions:[],
+        CompanyTypeOptions: [],
+        InOptions: [],
+        ManagementUnitOptions:[],
+        dictData: null,
         // 查询项
         searchFormReset: {},
         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 +1097,7 @@
       Object.assign(this.searchFormReset, this.searchForm)
     //查询列表
     this.initDatas()
-    //this.getDictOptions()
+    this.getDictOptions()
   },
 
     methods: {
@@ -910,15 +1159,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') {
@@ -937,10 +1220,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 () {
@@ -981,7 +1266,7 @@
       jstimehandle (val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00Z') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'
@@ -991,6 +1276,7 @@
         }
       },
 
+
       formatDateTime (date) {
         var y = date.getFullYear()
       var m = date.getMonth() + 1

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 技术服务类未通过列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 基建类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 物资类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 技术服务类待入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 基建类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 物资类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -11,6 +11,9 @@
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>

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

@@ -10,6 +10,9 @@
           <i class="icon icon-table2"></i> 技术服务类已入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>