Merge branch 'master' of http://git.cc-lotus.info/news-zhwl/cms-zhwl

src/router/order.js

@@ -9,4 +9,19 @@ export default [
     component: () => import('../views/order/index-card.vue'),
     meta: { title: '订单-卡片模式' },
   },
+  {
+    path: '/order/in',
+    component: () => import('../views/order/in.vue'),
+    meta: { title: '收入管理' },
+  },
+  {
+    path: '/order/transport',
+    component: () => import('../views/order/transport/index.vue'),
+    meta: { title: '装车' },
+  },
+  {
+    path: '/order/transport/sign',
+    component: () => import('../views/order/transport/sign.vue'),
+    meta: { title: '签收管理' },
+  },
 ];

src/views/order/in.vue

@@ -0,0 +1,101 @@
+<template>
+  <div id="in">
+    <el-row>
+      <el-col :span="24" class="container">
+        <el-col :span="24" class="info">
+          <data-table :fields="fields" :data="list" :opera="opera" :total="total" :size="50" :step="10" @query="search" @assign="assign">
+            <template #options="{item}">
+              <template v-if="item.model == 'name'">
+                <el-option v-for="(item, index) in nameList" :key="index" :value="item.name" :label="item.name"></el-option>
+              </template>
+            </template>
+          </data-table>
+        </el-col>
+      </el-col>
+    </el-row>
+    <el-dialog :visible.sync="dialog" title="客户合同详情" @close="toClose" width="50%">
+      <!-- 物流里面的:data要换成v-model -->
+      <data-form v-model="form" :fields="formFields" :rules="rules" @save="turnSave" :submitText="submitText">
+        <template #options="{item}">
+          <template v-if="item.model == 'charge'">
+            <el-option v-for="(item, index) in chargeList" :key="index" :value="item.name" :label="item.name"></el-option>
+          </template>
+        </template>
+      </data-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'in',
+  props: {},
+  components: {},
+  data: function() {
+    return {
+      fields: [
+        { label: '订单号', model: 'num', filter: 'input' },
+        { label: '客户', model: 'name', filter: 'select' },
+        { label: '要求发货日期', model: 'time', filter: 'input' },
+        { label: '状态', model: 'sate' },
+      ],
+      list: [
+        {
+          num: '66464',
+          name: '伟巴斯特（长春）车顶系统有限公司-北京天津线',
+          time: '2020-2-14',
+          sate: '到达',
+        },
+        {
+          num: '66464',
+          name: '伟巴斯特（长春）车顶系统有限公司-北京天津线',
+          time: '2020-2-14',
+          sate: '到达',
+        },
+      ],
+      total: 0,
+      opera: [
+        { label: '修改收入', method: 'modify' },
+        { label: '指派负责人', method: 'assign' },
+      ],
+      //客戶列表
+      nameList: [{ name: '公司1' }, { name: '公司2' }, { name: '公司3' }, { name: '公司4' }, { name: '公司5' }],
+      dialog: false,
+      form: {},
+      formFields: [{ label: '负责人', model: 'charge', type: 'select' }],
+      rules: {
+        charge: [{ required: true, message: '请选择指派负责人', trigger: 'blur' }],
+      },
+      //指派负责人列表
+      chargeList: [{ name: '张三' }, { name: '李四' }],
+      submitText: '指派',
+    };
+  },
+  created() {},
+  methods: {
+    async search() {
+      console.log('查询');
+    },
+    assign() {
+      this.dialog = true;
+    },
+    //关闭
+    toClose() {
+      this.dialog = false;
+    },
+    //保存
+    turnSave(data) {
+      console.log(data);
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/order/transport/index.vue

@@ -0,0 +1,31 @@
+<template>
+  <div id="index">
+    <el-row>
+      <el-col :span="24">
+        <p>index</p>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'index',
+  props: {},
+  components: {},
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+};
+</script>
+
+<style lang="less" scoped></style>

src/views/order/transport/sign.vue

@@ -0,0 +1,31 @@
+<template>
+  <div id="sign">
+    <el-row>
+      <el-col :span="24">
+        <p>sign</p>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { mapState, createNamespacedHelpers } from 'vuex';
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'sign',
+  props: {},
+  components: {},
+  data: function() {
+    return {};
+  },
+  created() {},
+  methods: {},
+  computed: {
+    ...mapState(['user']),
+  },
+};
+</script>
+
+<style lang="less" scoped></style>