合同评审

src/views/modules/cus/contract-add-or-update.vue

@@ -101,7 +101,7 @@
 </template>
 
 <script>
-  import { getCoCode, getreDetail } from '@/api/cus'
+  import { getCoCode, geTreDetail } from '@/api/cus'
   import { getDictList } from '@/api/dict'
   import { uploadUrl, downloadUrl, uploadFiles } from '@/api/file'
   export default {
@@ -152,6 +152,7 @@
     },
     methods: {
       async init (id, disable) {
+        this.display = disable
         this.fileList = []
         this.visible = true
         this.id = id || 0
@@ -167,7 +168,7 @@
           }
         })
         if (!id) return
-        await getreDetail().then(({data}) => {
+        await geTreDetail(id).then(({data}) => {
           if (data && data.code === '200') {
             this.dataForm = data.data
           }

src/views/modules/cus/contract.vue

@@ -21,13 +21,13 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="reCode"
         header-align="center"
         align="center"
         label="评审编码">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="coCode"
         header-align="center"
         align="center"
         label="沟通编码">
@@ -51,7 +51,8 @@
         label="对接业务员">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="reType"
+        :formatter="typeFormat"
         header-align="center"
         align="center"
         label="类别">
@@ -69,10 +70,11 @@
         label="备注">
       </el-table-column>
       <el-table-column
-        prop="-"
+        prop="state"
+        :formatter="stateFormat"
         header-align="center"
         align="center"
-        label="附件">
+        label="状态">
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -81,7 +83,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="details(scope.row.reId, true)">查看</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.reId, true)">查看</el-button>
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.reId, false)">编辑</el-button>
         </template>
       </el-table-column>
@@ -102,6 +104,7 @@
 
 <script>
   import AddOrUpdate from './contract-add-or-update'
+  import { getDictList } from '@/api/dict'
   export default {
     name: 'contract',
     components: {
@@ -111,19 +114,45 @@
       return {
         addOrUpdateVisible: false,
         dataForm: {},
-        options: [],
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
         dataListLoading: false,
-        dataListSelections: []
+        dataListSelections: [],
+        optionsState: [
+          {
+            code: '0', value: '待提交'
+          },
+          {
+            code: '1', value: '待审批'
+          },
+          {
+            code: '2', value: '审批中'
+          },
+          {
+            code: '3', value: '审批完成'
+          },
+          {
+            code: '4', value: '审批不通过'
+          }
+        ]
       }
     },
     created () {
+      this.getTypeList()
+      // this.getStateList()
       this.getDataList()
     },
     methods: {
+      // 获取类型列表
+      getTypeList () {
+        getDictList({type: 'review_type'}).then(({data}) => {
+          if (data) {
+            this.options = data
+          }
+        })
+      },
       // 查询
       search () {
         this.pageIndex = 1
@@ -173,6 +202,26 @@
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(id, disable)
         })
+      },
+      // 转换属性“类别”
+      typeFormat (row) {
+        if (this.options) {
+          for (let i = 0; i < this.options.length; i++) {
+            if (this.options[i].code === row.reType) {
+              return this.options[i].value
+            }
+          }
+        }
+      },
+      // 转换属性“状态”
+      stateFormat (row) {
+        if (this.optionsState) {
+          for (let i = 0; i < this.optionsState.length; i++) {
+            if (this.optionsState[i].code === row.state) {
+              return this.optionsState[i].value
+            }
+          }
+        }
       }
     }
   }

src/views/modules/order/dispatch.vue

@@ -0,0 +1,14 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    // 发货管理
+    name: 'dispatch'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/order/order.vue

@@ -0,0 +1,14 @@
+<template>
+
+</template>
+
+<script>
+  export default {
+    // 订单管理
+    name: 'order'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/views/modules/warehouse/stock-order.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="stock-order">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="queryData()">
       <el-form-item label="出入库类型">
         <el-select v-model="dataForm.recordType" placeholder="请选择">
           <el-option
@@ -25,7 +25,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
+        <el-button @click="queryData()">查询</el-button>
       </el-form-item>
       <el-form-item>
         <el-button v-if="isAuth('wh:in-out-bound-ctl:inbound')" type="primary" @click="inBound()">入库申请</el-button>
@@ -160,6 +160,10 @@
       }
     },
     methods: {
+      queryData () {
+        this.pageIndex = 1
+        this.getDataList()
+      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true