Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/bidingDocument/IssueTender/detailsPageEdit.vue

@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            icon="el-icon-arrow-left"
+            @click="backToList"
+        >返回列表
+        </el-button>
+      </div>
+      <div>
+        <div class="el-button&#45;&#45;small-yh add-customer-btn">
+          <el-button type="primary" size="small">保存</el-button>
+        </div>
+      </div>
+    </div>
+    <trade-card title="基础资料" style="margin-top: 50px">
+      1
+    </trade-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detailsPageEdit",
+  methods:{
+    backToList(){
+      this.$emit('backToList', false)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/bidingDocument/IssueTender/index.vue

@@ -0,0 +1,52 @@
+<template>
+  <div v-if="false">
+    <basic-container v-show="!show">
+      <avue-crud :option="option" :data="dataList" :page.sync="page">
+        <template slot-scope="scope" slot="menuLeft">
+          <el-button type="primary"
+                     icon="el-icon-plus"
+                     size="small"
+                     @click="rowSave">新增</el-button>
+        </template>
+      </avue-crud>
+    </basic-container>
+    <details-page-edit v-if="show" @backToList="backToList"></details-page-edit>
+  </div>
+</template>
+
+<script>
+import detailsPageEdit from './detailsPageEdit'
+export default {
+  components: {
+    detailsPageEdit
+  },
+  data(){
+    return {
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 50, 100, 200, 300]
+      },
+      dataList:[],
+      show:false,
+      option:{
+        addBtn:false
+      }
+    }
+  },
+  methods:{
+    rowSave(){
+      this.show = true
+    },
+    backToList(args){
+      this.show = false
+      console.log(args)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -91,7 +91,7 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 3 && (roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
+              v-if="goodsForm.status === 3 && ((roleName.indexOf('车队') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
               size="small"
               :loading="type"
               @click="cancelScheduling('1')"
@@ -99,7 +99,7 @@
           </el-button>
           <el-button
               type="warning"
-              v-if="goodsForm.status === 6 && (roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
+              v-if="goodsForm.status === 6 && ((roleName.indexOf('司机') !== -1 || roleName.indexOf('admin') !== -1) || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1))"
               size="small"
               :loading="type"
               @click="cancelScheduling('3')"
@@ -2766,7 +2766,8 @@ export default {
         this.typeTwo = true
         this.goodsForm.status = 0
         if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)) {
-          this.goodsOptionFormTwo.disabled = true
+          // this.goodsOptionFormTwo.disabled = true
+          this.$set(this.goodsOptionFormTwo,'disabled',false)
         }
       } else {
         this.goodsOptionFormC.disabled = false
@@ -2775,7 +2776,8 @@ export default {
         this.typeTwo = true
         this.goodsForm.status = 0
         if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)) {
-          this.goodsOptionFormTwo.disabled = false
+          // this.goodsOptionFormTwo.disabled = false
+          this.$set(this.goodsOptionFormTwo,'disabled',false)
           this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
           this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
           this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -1121,7 +1121,7 @@ export default {
     },
     //查询
     onLoad(page, params) {
-      motorcadeDriver(4).then(res => {
+      motorcadeDriver({tag:4}).then(res => {
         this.totalData = res.data.data
       })
       let queryParams = {

src/views/landTransportation/driver/index.vue

@@ -82,12 +82,12 @@
         <template slot-scope="{row}" slot="fleetId">
           <span>{{ row.fleetName }}</span>
         </template>
-        <template slot-scope="{row}" slot="fleetIdSearch">
-          <crop-select
-              v-model="row.fleetId"
-              corpType="CD"
-          ></crop-select>
-        </template>
+<!--        <template slot-scope="{row}" slot="fleetIdSearch">-->
+<!--          <crop-select-->
+<!--              v-model="row.fleetId"-->
+<!--              corpType="CD"-->
+<!--          ></crop-select>-->
+<!--        </template>-->
         <template slot-scope="{row,index}" slot="menu">
           <el-button
               type="text"
@@ -323,8 +323,16 @@ export default {
           width: 90,
           search: true,
           index:7,
-          overHidden: true,
-          prop: 'fleetId'
+          filterable: true,
+          // overHidden: true,
+          prop: 'fleetId',
+          type: 'select',
+          dicUrl: "/api/blade-client/corpsdesc/fleetList",
+          cascader: ['plateNo'],
+          props: {
+            label: "cname",
+            value: "id"
+          }
         },{
           label: '车号',
           width: 82,

src/views/landTransportation/motorcadeDriver/index.vue

@@ -96,12 +96,12 @@
         <template slot-scope="{row}" slot="fleetId">
           <span>{{ row.fleetName }}</span>
         </template>
-        <template slot-scope="{row}" slot="fleetIdSearch">
-          <crop-select
-              v-model="row.fleetId"
-              corpType="CD"
-          ></crop-select>
-        </template>
+<!--        <template slot-scope="{row}" slot="fleetIdSearch">-->
+<!--          <crop-select-->
+<!--              v-model="row.fleetId"-->
+<!--              corpType="CD"-->
+<!--          ></crop-select>-->
+<!--        </template>-->
         <template slot-scope="{row}" slot="plateNo">
           <span class="el-button--text" style="cursor: pointer"
                 @click="openTrack(row)">{{ row.plateNo }}</span>
@@ -480,7 +480,7 @@ export default {
               label: "cname",
               value: "id"
             },
-            cell: true
+            // cell: true
           }, {
             label: '车号',
             width: 82,

src/views/landTransportation/reportAnalysis/index.vue

@@ -1197,7 +1197,7 @@ export default {
     },
     //查询
     onLoad(page, params) {
-      motorcadeDriver(4).then(res => {
+      motorcadeDriver({tag:4}).then(res => {
         this.totalData = res.data.data
       })
       let queryParams = {

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -117,7 +117,14 @@ export default {
     // 台账
     // reminder
     // 到期提醒
-    if (this.roleName.indexOf('平台') !== -1){
+    if (this.roleName.indexOf('admin') !== -1){
+      this.entrust = true
+      this.dispatch = true
+      this.sBook = true
+      this.reminder = true
+      this.sendACar = true
+      this.track = true
+    }else if (this.roleName.indexOf('平台') !== -1){
       if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1){
         // 调度、台账、到期提醒
         this.entrust = true //委托
@@ -125,8 +132,7 @@ export default {
         this.sBook = true //台账
         this.reminder = true //到期提醒
       }
-    }
-    if (this.roleName.indexOf('客户') !== -1){
+    }else if (this.roleName.indexOf('客户') !== -1){
       if (this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('业务员') !== -1){
         // 委托、台账
         this.entrust = true //委托
@@ -139,21 +145,12 @@ export default {
         this.sendACar = false
         this.track = false
       }
-    }
-    if (this.roleName.indexOf('车队') !== -1){
+    }else if (this.roleName.indexOf('车队') !== -1){
       this.sendACar = true
       this.track = true
       this.sBook = true
       this.reminder = true
     }
-    if (this.roleName.indexOf('admin') !== -1){
-      this.entrust = true
-      this.dispatch = true
-      this.sBook = true
-      this.reminder = true
-      this.sendACar = true
-      this.track = true
-    }
   },
   methods: {
     inPage(type) {

vue.config.js

@@ -31,12 +31,12 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        // target: 'http://192.168.1.150:1080',
+        // target: 'http://192.168.3.64:1080',
         // target: 'http://192.168.1.102:1080',
         // target: 'http://124.222.119.174:1080',
         // 打包地址
-        // target: 'http://121.37.83.47:10004',//服务器ip
-        target: 'http://trade.tubaosoft.com:10004',//服务器域名
+        target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'