Jelajahi Sumber

添加权限

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing 6 tahun lalu
induk
melakukan
8ee3dd01f9

+ 8 - 4
src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -5,7 +5,7 @@
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
            <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button> 
-          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd">添加
+          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加
           </el-button>
         </span>
       </div>
@@ -122,6 +122,10 @@
         type: Boolean,
         default: false
       },
+      newcanadd: {
+        type: Boolean,
+        default: false
+      },
       candelete: {
         type: Boolean,
         default: false
@@ -134,7 +138,7 @@
       ...mapGetters({
         session: 'session'
       })
-    },*/
+    }, */
     data () {
       var CheckSelectedOption = (rule, value, callback) => {
         if (this.selectedOptList && this.selectedOptList.length < 1) {
@@ -143,7 +147,7 @@
           callback()
         }
       }
-    return {
+      return {
         loading: false,
         Ids: [],
         SupplierId: 0,
@@ -400,7 +404,7 @@
               lock: true,
               text: '正在删除请稍后...'
             })
-          _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
+            _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
               .then(function (response) {
                 if (response.data.code === 0) {
                   _this.$message({

+ 8 - 4
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -5,7 +5,7 @@
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
           <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
-          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd">添加</el-button>
+          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
         </span>
       </div>
       <el-table :data="goodsList" border size="mini"  @selection-change="handleSelectionChange">
@@ -82,6 +82,10 @@
         type: Boolean,
         default: false
       },
+      newcanadd: {
+        type: Boolean,
+        default: false
+      },
       candelete: {
         type: Boolean,
         default: false
@@ -94,11 +98,11 @@
       ...mapGetters({
         session: 'session'
       })
-    },*/
+    }, */
     watch: {
       filterText (val) {
         this.$refs.orgmanagetree.filter(val)
-    }
+      }
     },
     data () {
       return {
@@ -261,7 +265,7 @@
               lock: true,
               text: '正在删除请稍后...'
             })
-          _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
+            _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
               .then(function (response) {
                 if (response.data.code === 0) {
                   _this.$message({

+ 7 - 3
src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -5,7 +5,7 @@
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
            <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
-          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd">添加
+          <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加
          
           </el-button>
         </span>
@@ -74,12 +74,16 @@
         type: Boolean,
         default: false
       },
+      newcanadd: {
+        type: Boolean,
+        default: false
+      },
       candelete: {
         type: Boolean,
         default: false
       }
     },
-    /*created() {
+    /* created() {
       this.initData()
     },
     computed: {
@@ -225,7 +229,7 @@
               lock: true,
               text: '正在删除请稍后...'
             })
-          _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
+            _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {})
               .then(function (response) {
                 if (response.data.code === 0) {
                   _this.$message({

+ 5 - 3
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierstore/basislist' }">基建类入库列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierstore/basislist' }">基建类入库列表</el-breadcrumb-item>
       <el-breadcrumb-item>基建类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -176,8 +176,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
-            height="360px" style="margin-top: 20px" :candelete="delete_flat"></business-list>
+          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat" 
+            height="360px" style="margin-top: 20px" :candelete="delete_flat" :newcanadd="newadd_flat"></business-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" @close="selectAuditOrg"
@@ -301,6 +301,7 @@
     data () {
       return {
         delete_flat: true,
+        newadd_flat: true,
         activeName: '0',
         chooseAuditorVisible: false,
         showReturn: 1,
@@ -481,6 +482,7 @@
         api.getJurisdiction(this.$axios).then(res => {
           if (!res.data.item) {
             this.delete_flat = false
+            this.newadd_flat = false
           }
         }).catch(err => {
           console.error(err)

+ 4 - 4
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierstore/goodslist' }">物资类入库列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierstore/goodslist' }">物资类入库列表</el-breadcrumb-item>
       <el-breadcrumb-item>物资类供方准入评审表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -177,7 +177,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" height="360px"
+          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat" height="360px"
             style="margin-top: 20px" :candelete="delete_flat"></goods-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
@@ -410,6 +410,7 @@
           Status: 0
         },
         add_flat: true,
+        newadd_flat: true,
         entrydetail: {
           process: 'oil_supplier_apply_1',
           business: '',
@@ -457,10 +458,9 @@
     methods: {
       Jurisdiction () {
         api.getJurisdiction(this.$axios).then(res => {
-          console.log('qwewqe')
-          console.log(res.data.item)
           if (!res.data.item) {
             this.delete_flat = false
+            this.newadd_flat = false
           }
         }).catch(err => {
           console.error(err)

+ 6 - 4
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -184,7 +184,7 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane name="3" label="准入范围" :disabled="!certId">
-          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" height="360px"
+          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat" height="360px"
             style="margin-top: 20px" :candelete="delete_flat"></tech-list>
         </el-tab-pane>
         <el-tab-pane name="4" label="企业资质" :disabled="!certId">
@@ -441,6 +441,7 @@
           WorkflowId: ''
         },
         add_flat: true,
+        newadd_flat: true,
         entrydetail: {
           process: 'oil_supplier_apply_1',
           business: '',
@@ -489,6 +490,7 @@
         api.getJurisdiction(this.$axios).then(res => {
           if (!res.data.item) {
             this.delete_flat = false
+            this.newadd_flat = false
           }
         }).catch(err => {
           console.error(err)
@@ -591,7 +593,7 @@
         /* this.$refs["TechInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }*/
+        } */
       },
 
       isCanUpdateSupplier (supplierId) {
@@ -647,7 +649,7 @@
 
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }*/
+            } */
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
@@ -655,7 +657,7 @@
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /* if (this.certId && this.formDataCert.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /!* 刷新工作流 *!/
-            }*/
+            } */
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)

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

@@ -7,7 +7,7 @@
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 基建类入库列表
+          <i class="icon icon-table2"></i> 基建类入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -279,9 +279,9 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
-  import api from '@/api/oilsupplier/supplier';
-  import certApi from '@/api/oilsupplier/suppliercert'
+  import { mapGetters } from 'vuex'
+import api from '@/api/oilsupplier/supplier'
+import certApi from '@/api/oilsupplier/suppliercert'
 
   export default {
     computed: {
@@ -291,95 +291,95 @@
     },
     name: 'oilsupplier',
 
-    data() {
+    data () {
       return {
         dialogVisible: false,
-        //列表数据
-         countryoptions: [],
+        // 列表数据
+        countryoptions: [],
         CityAry: [],
-        LinkCityAry:[],
+        LinkCityAry: [],
         countryprops: {
-        value: 'adcode',
-        label: 'name',
-        children: 'districts'
+          value: 'adcode',
+          label: 'name',
+          children: 'districts'
         },
-        //列表数据
+        // 列表数据
         entityList: [],
-        OperTypeOptions:[],
-        UnitRelationOptions:[],
-        countryListOptions:[],
+        OperTypeOptions: [],
+        UnitRelationOptions: [],
+        countryListOptions: [],
         CompanyTypeOptions: [],
         InOptions: [],
-        ManagementUnitOptions:[],
+        ManagementUnitOptions: [],
         dictData: null,
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
+        // 查询项
         searchFormReset: {},
         searchForm: {
           Id: '',
           SupplierName: '',
-          OperType:'',
-          SpecTypeCode:'',
-          Country:'',
-          InStyle:'',
-          MgrUnit:'',
-          PACNumber:'',
-          CommercialNo:'',
-          Province:'',
+          OperType: '',
+          SpecTypeCode: '',
+          Country: '',
+          InStyle: '',
+          MgrUnit: '',
+          PACNumber: '',
+          CommercialNo: '',
+          Province: '',
           City: '',
-          Street:'',
-          Address:'',
-          LinkProvince:'',
-          LinkCity:'',
-          LinkStreet:'',
-          LinkAddress:'',
-          LegalPerson:'',
-          ContactName:'',
-          CompanyType:'',
-          SetupTime:'',
-          RegCapital1:'',
-          RegCapital2:'',
-          BusinessScope:'',
+          Street: '',
+          Address: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkAddress: '',
+          LegalPerson: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: '',
+          RegCapital1: '',
+          RegCapital2: '',
+          BusinessScope: ''
         },
         tableColumns: [
 
-          /*{
+          /* {
            prop: "Id",
            label: '',
            width: 100,
            sort: true
            },*/
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 130,
             sort: true
           },
           {
-            prop: "InFlag",
+            prop: 'InFlag',
             label: '准入标识',
             width: 110,
             sort: true
           },
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
@@ -397,23 +397,23 @@
            label: '级别',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "MgrUnit",
            label: '管理单位',
            width: 100,
            sort: true
            },*/
 
-          /*{
+          /* {
            prop: "OperType",
            label: '经营方式',
            width: 100,
            sort: true
            },*/
 
-          /*{
+          /* {
            prop: "Country",
            label: '国家',
            width: 100,
@@ -435,13 +435,13 @@
            },*/
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
@@ -449,7 +449,7 @@
            },*/
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 240,
             sort: true
@@ -460,16 +460,16 @@
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "Province",
            label: '省直辖市',
            width: 200,
@@ -586,114 +586,114 @@
            label: '行业类别名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "SpecSupplier",
            label: '是否特殊业务供应商(可不招标)',
            width: 100,
@@ -715,7 +715,7 @@
            },*/
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -725,15 +725,15 @@
       }
     },
     created () {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      this.getDictOptions()
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+    //查询列表
+    this.initDatas()
+    this.getDictOptions()
     },
     methods: {
-      initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -744,16 +744,16 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn !=null && this.CreateOn.length == 2) {
+        if (this.CreateOn != null && this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getStoreList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -762,31 +762,30 @@
         })
       },
 
-           getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-           this.dictData = res.data.items
-           console.log(this.dictData)
-           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'])
-
+          this.dictData = res.data.items
+          console.log(this.dictData)
+          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)
         })
       },
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -795,20 +794,20 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        //this.searchForm = this.searchFormReset;
-         this.CityAry = []
-        this.LinkCityAry=[]
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+      //this.searchForm = this.searchFormReset;
+       this.CityAry = []
+        this.LinkCityAry = []
         this.CreateOn = ''
         this.initDatas()
       },
-          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)
-    },
+      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)
+      },
       getCountryList (val) {
         let tmpJson = JSON.parse(val)
         this.countryListOptions = []
@@ -822,51 +821,51 @@
         }
       },
       handleLinkAreaChange (value) {
-      this.searchForm.LinkProvince = value[0]
-      this.searchForm.LinkCity = value[1]
-      this.searchForm.LinkStreet = value[2]
+        this.searchForm.LinkProvince = value[0]
+        this.searchForm.LinkCity = value[1]
+        this.searchForm.LinkStreet = value[2]
       },
       handleAreaChange (value) {
-      this.searchForm.Province = value[0]
-      this.searchForm.City = value[1]
-      this.searchForm.Street = value[2]
+        this.searchForm.Province = value[0]
+        this.searchForm.City = value[1]
+        this.searchForm.Street = value[2]
       },
-      handleSearch() {
-        this.currentPage = 1;
-        this.dialogVisible = false;
-        this.initDatas();
-      },
-      handleCurrentChange(value) {
+      handleSearch () {
+        this.currentPage = 1
+      this.dialogVisible = false
+      this.initDatas()
+    },
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initDatas()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
-        api.deleteEntity(row.Id, this.$axios).then(res => {
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
+      api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
-            this.$message({
+            this.initDatas()
+          this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
+        })
+    },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -879,20 +878,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -7,7 +7,7 @@
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 物资类入库列表
+          <i class="icon icon-table2"></i> 物资类入库列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
@@ -296,20 +296,20 @@
         // 列表数据
         countryoptions: [],
         CityAry: [],
-        LinkCityAry:[],
+        LinkCityAry: [],
         countryprops: {
-        value: 'adcode',
-        label: 'name',
-        children: 'districts'
+          value: 'adcode',
+          label: 'name',
+          children: 'districts'
         },
-        //列表数据
+        // 列表数据
         entityList: [],
-        OperTypeOptions:[],
-        UnitRelationOptions:[],
-        countryListOptions:[],
+        OperTypeOptions: [],
+        UnitRelationOptions: [],
+        countryListOptions: [],
         CompanyTypeOptions: [],
         InOptions: [],
-        ManagementUnitOptions:[],
+        ManagementUnitOptions: [],
         dictData: null,
         // 分页参数
         size: 10,
@@ -324,31 +324,31 @@
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
         // 查询项
         searchFormReset: {},
-          searchForm: {
+        searchForm: {
           Id: '',
           SupplierName: '',
-          OperType:'',
-          SpecTypeCode:'',
-          Country:'',
-          InStyle:'',
-          MgrUnit:'',
-          PACNumber:'',
-          CommercialNo:'',
-          Province:'',
+          OperType: '',
+          SpecTypeCode: '',
+          Country: '',
+          InStyle: '',
+          MgrUnit: '',
+          PACNumber: '',
+          CommercialNo: '',
+          Province: '',
           City: '',
-          Street:'',
-          Address:'',
-          LinkProvince:'',
-          LinkCity:'',
-          LinkStreet:'',
-          LinkAddress:'',
-          LegalPerson:'',
-          ContactName:'',
-          CompanyType:'',
-          SetupTime:'',
-          RegCapital1:'',
-          RegCapital2:'',
-          BusinessScope:'',
+          Street: '',
+          Address: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkAddress: '',
+          LegalPerson: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: '',
+          RegCapital1: '',
+          RegCapital2: '',
+          BusinessScope: ''
         },
         tableColumns: [
 
@@ -531,7 +531,7 @@
         }
         let myCreateOn = []
         // 解析时间
-        if (this.CreateOn !=null && this.CreateOn.length === 2) {
+        if (this.CreateOn != null && this.CreateOn.length === 2) {
           this.CreateOn[1].setHours(23)
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)
@@ -548,22 +548,22 @@
           console.error(err)
         })
       },
-  handleLinkAreaChange (value) {
-      this.searchForm.LinkProvince = value[0]
-      this.searchForm.LinkCity = value[1]
-      this.searchForm.LinkStreet = value[2]
+    handleLinkAreaChange (value) {
+        this.searchForm.LinkProvince = value[0]
+        this.searchForm.LinkCity = value[1]
+        this.searchForm.LinkStreet = value[2]
       },
       handleAreaChange (value) {
-      this.searchForm.Province = value[0]
-      this.searchForm.City = value[1]
-      this.searchForm.Street = value[2]
+        this.searchForm.Province = value[0]
+        this.searchForm.City = value[1]
+        this.searchForm.Street = value[2]
+      },
+      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)
       },
-        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)
-    },
       getCountryList (val) {
         let tmpJson = JSON.parse(val)
         this.countryListOptions = []
@@ -576,18 +576,17 @@
           })
         }
       },
-       getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-           this.dictData = res.data.items
-           console.log(this.dictData)
-           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'])
-
+          this.dictData = res.data.items
+          console.log(this.dictData)
+          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)
         })
@@ -611,10 +610,10 @@
         this.initDatas()
       },
       clearSearch () {
-        Object.assign(this.searchForm, this.searchFormReset);
-        // this.searchForm = this.searchFormReset;
-          this.CityAry = []
-        this.LinkCityAry=[]
+        Object.assign(this.searchForm, this.searchFormReset)
+      // this.searchForm = this.searchFormReset;
+        this.CityAry = []
+        this.LinkCityAry = []
         this.CreateOn = ''
         this.initDatas()
       },

+ 101 - 94
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>入库列表</el-breadcrumb-item>
+      <el-breadcrumb-item>入库列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 入库列表
+          <i class="icon icon-table2"></i> 入库列表
         </span>
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -41,7 +41,7 @@
       <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="200" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplierstore/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/supplierstore/' + scope.row.Id + '/'+changeFlag(scope.row.SupplierTypeName)+'?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
 
@@ -462,55 +462,55 @@
     data () {
       return {
         dialogVisible: false,
-        //列表数据
+        // 列表数据
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
-        //查询项
+        // 查询项
         searchFormReset: {},
         searchForm: {
           SupplierTypeName: ''
         },
         tableColumns: [
 
-          /*{
+          /* {
            prop: "Id",
            label: '',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "AccessCardNo",
+            prop: 'AccessCardNo',
             label: '准入证编号',
             width: 240,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
+            prop: 'SupplierTypeName',
             label: '准入类别',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 240,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OilCertificateNo",
            label: '中石油供应商证书号',
            width: 100,
@@ -522,23 +522,23 @@
            label: '级别',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "MgrUnit",
            label: '管理单位',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "OperType",
            label: '经营方式',
            width: 100,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "Country",
            label: '国家',
            width: 100,
@@ -557,44 +557,44 @@
            label: '施工队伍名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "OrganCode",
            label: '组织机构代码',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "CountryTaxNo",
+            prop: 'CountryTaxNo',
             label: '税务登记证编号',
             width: 260,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "LocalTaxNo",
            label: '税务登记证地税编号',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Address",
+            prop: 'Address',
             label: '单位地址',
             width: 280,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "Province",
            label: '省直辖市',
            width: 200,
@@ -627,9 +627,9 @@
            label: '邮编',
            width: 200,
            sort: true
-           },*/
+           }, */
 
-          /*{
+          /* {
            prop: "QualitySystemCert",
            label: '质量管理体系认证情况及认证机构',
            width: 300,
@@ -711,114 +711,114 @@
            label: '行业类别名称',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "RegCapital",
+            prop: 'RegCapital',
             label: '注册资本',
             width: 150,
             sort: true
           },
 
           {
-            prop: "Currency",
+            prop: 'Currency',
             label: '币种',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ContactName",
+            prop: 'ContactName',
             label: '联系人姓名',
             width: 140,
             sort: true
           },
 
           {
-            prop: "CompanyType",
+            prop: 'CompanyType',
             label: '公司类型',
             width: 150,
             sort: true
           },
 
           {
-            prop: "SetupTime",
+            prop: 'SetupTime',
             label: '成立时间',
             width: 220,
             sort: true
           },
 
           {
-            prop: "DepositBank",
+            prop: 'DepositBank',
             label: '开户银行',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankAccount",
+            prop: 'BankAccount',
             label: '银行账号',
             width: 220,
             sort: true
           },
 
           {
-            prop: "EMail",
+            prop: 'EMail',
             label: '电子邮箱',
             width: 220,
             sort: true
           },
 
           {
-            prop: "BankCreditRating",
+            prop: 'BankCreditRating',
             label: '银行信用等级',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Mobile",
+            prop: 'Mobile',
             label: '移动电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Telphone",
+            prop: 'Telphone',
             label: '固定电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "Fax",
+            prop: 'Fax',
             label: '传真',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyTel",
+            prop: 'CompanyTel',
             label: '公司电话',
             width: 220,
             sort: true
           },
 
           {
-            prop: "QQ",
+            prop: 'QQ',
             label: 'QQ号码',
             width: 220,
             sort: true
           },
 
           {
-            prop: "CompanyUrl",
+            prop: 'CompanyUrl',
             label: '公司网址',
             width: 220,
             sort: true
           },
 
-          /*{
+          /* {
            prop: "SpecSupplier",
            label: '是否特殊业务供应商(可不招标)',
            width: 100,
@@ -837,10 +837,10 @@
            label: '业务类型(1战略合作,2内部多经,3区域关键,4专业化实施)',
            width: 100,
            sort: true
-           },*/
+           }, */
 
           {
-            prop: "Remark",
+            prop: 'Remark',
             label: '备注',
             width: 220,
             sort: true
@@ -850,16 +850,25 @@
       }
     },
     created () {
-      //查询条件初始值备份
-      Object.assign(this.searchFormReset, this.searchForm);
-      //查询列表
-      this.initDatas();
-      //this.getDictOptions()
-    },
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.initDatas()
+    // this.getDictOptions()
+  },
 
     methods: {
-      initDatas() {
-        //分页及列表条件
+      changeFlag (val) {
+        if (val == '物资类') {
+          return 'goodsedit'
+        } else if (val == '基建类') {
+          return 'basisedit'
+        } else{
+          return 'techedit'
+        }
+      },
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -877,9 +886,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getStoreList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -890,49 +899,49 @@
       //  列表打印导出功能
       exportExcel () {
         /* generate workbook object from table */
-        let table = document.querySelector("#rebateSetTable").cloneNode(true); //克隆备份(原table不动)
+        let table = document.querySelector('#rebateSetTable').cloneNode(true) // 克隆备份(原table不动)
         // 因为element-ui的表格的fixed属性导致多出一个table,会下载重复内容,这里删除掉
-        table.removeChild(table.querySelector(".el-table__fixed-right")) //删掉备份的子节点
+        table.removeChild(table.querySelector('.el-table__fixed-right')) // 删掉备份的子节点
         let wb = XLSX.utils.table_to_book(table, {
           raw: true
         })
         /* get binary string as output */
         let wbout = XLSX.write(wb, {
-          bookType: "xlsx",
+          bookType: 'xlsx',
           bookSST: true,
-          type: "array"
+          type: 'array'
         })
         try {
           FileSaver.saveAs(
             new Blob([wbout], {
-              type: "application/octet-stream"
+              type: 'application/octet-stream'
             }),
-            "SupplierStore.xlsx"
+            'SupplierStore.xlsx'
           )
         } catch (e) {
-          if (typeof console !== "undefined") console.log(e, wbout)
+          if (typeof console !== 'undefined') console.log(e, wbout)
         }
         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.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
         })
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -941,8 +950,8 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
         // this.searchForm = this.searchFormReset
         this.CreateOn = ''
         this.initDatas()
@@ -961,28 +970,27 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
-        row.deleteConfirmFlag = false;
+      deleteEntity (row) {
+        row.deleteConfirmFlag = false
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-
+            })
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
+            })
           }
         }).catch(err => {
           console.error(err)
-        });
+        })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -995,20 +1003,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       }
     }
   }
-
 </script>
 
 <style lang="scss">