供应链

src/components/selects/reference/index.vue

@@ -229,7 +229,7 @@ export default {
           // { title: '订单号', align: 'center', key: 'purchase_order_apply_no', minWidth: 200, },
           { title: '订单号', align: 'center', key: 'purchase_order_apply_no', minWidth: 200, },
           { title: '请购类型', align: 'center', key: 'type_title', minWidth: 150, },
-          { title: '项目名称', align: 'center', key: 'client_name', minWidth: 150 },
+          { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 150 },
           {
             title: '制单日期', align: 'center', key: 'crt_time', minWidth: 200,
             render: (h, params) =>
@@ -260,7 +260,7 @@ export default {
           { title: '选择', align: 'center', minWidth: 100, type: 'selection' },
           { title: '订单号', align: 'center', key: 'purchase_order_no', minWidth: 200, },
           { title: '采购类型', align: 'center', key: 'type_title', minWidth: 100, },
-          { title: '项目名称', align: 'center', key: 'client_name', minWidth: 150 },
+          { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 150 },
           { title: '供应商名称', align: 'center', key: 'supply_title', minWidth: 150 },
           {
             title: '预计到货', align: 'center', key: 'arrive_time', minWidth: 200,
@@ -297,7 +297,7 @@ export default {
           { title: '选择', align: 'center', minWidth: 100, type: 'selection' },
           { title: '订单号', align: 'center', key: 'purchase_order_no', minWidth: 200, },
           { title: '采购类型', align: 'center', key: 'type_title', minWidth: 100, },
-          { title: '项目名称', align: 'center', key: 'client_name', minWidth: 150 },
+          { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 150 },
           { title: '供应商名称', align: 'center', key: 'supply_title', minWidth: 150 },
           {
             title: '预计到货', align: 'center', key: 'arrive_time', minWidth: 200,
@@ -365,7 +365,7 @@ export default {
           { title: '选择', align: 'center', minWidth: 100, type: 'selection' },
           { title: '订单号', align: 'center', key: 'purchase_order_no', minWidth: 200, },
           { title: '采购类型', align: 'center', key: 'type_title', minWidth: 100, },
-          { title: '项目名称', align: 'center', key: 'client_name', minWidth: 150 },
+          { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 150 },
           { title: '供应商名称', align: 'center', key: 'supply_title', minWidth: 150 },
           {
             title: '预计到货', align: 'center', key: 'arrive_time', minWidth: 200,
@@ -463,7 +463,7 @@ export default {
         this.project_tableColumns = [
           { title: '选择', align: 'center', minWidth: 100, type: 'selection' },
           { title: '订单号', align: 'center', key: 'order_in_no', minWidth: 200, },
-          { title: '项目名称', align: 'center', key: 'client_name', minWidth: 150 },
+          { title: '项目名称', align: 'center', key: 'residential_name', minWidth: 150 },
           { title: '供应商名称', align: 'center', key: 'supply_title', minWidth: 150 },
           { title: '操作员', align: 'center', key: 'nickname', minWidth: 100 },
           {
@@ -611,6 +611,8 @@ export default {
       }).catch((err) => { });
     },
     getData (params) {
+      params.end_time = Date.parse(params.end_time).toString().slice(0,10)
+      params.start_time = Date.parse(params.start_time).toString().slice(0,10)
       this.axios(this.get_project_url, { params: params }).then((res) => {
         if (res.code == 200) {
           res.data.data.map((v) => (v.check = false))
@@ -693,7 +695,7 @@ export default {
             }
           }).then((res) => {
             res.data.forEach(element => {
-              element.client_name = row.client_name
+              element.residential_name = row.residential_name
             });
             this.parts_tableData = [...this.parts_tableData, ...res.data]
           }).catch((err) => { });

src/routerMap/index.js

@@ -293,6 +293,17 @@ const routerMap = [{
             ], resolve),
     },
     {
+        path: '/cms/productionorderlist/deliverylist/checkUnusual',
+        name: 'DeliveryList', //生产订单列表-->出库表-->查看异常
+        meta: {
+            index: 4
+        },
+        component: (resolve) =>
+            require([
+                '@/views/ProductionOrderList/Deliverylist/checkUnusual',
+            ], resolve),
+    },
+    {
         path: '/cms/productionorderlist/deliverylist/partsdetails',
         name: 'PartsDetails', //生产订单列表-->出库表-->工装家装订单列表-->工装家装订单详情-->部件详情
         meta: {

src/views/BasicSettings/SuppliersManage/SippliersClassify.vue

@@ -168,6 +168,8 @@ export default {
     handleSet () {
       this.type = 1
       this.showModal = true
+      this.form.code = ''
+      this.form.title = ''
     },
     renderContent (h, { root, node, data }) {
       return h('span', {

src/views/BasicSettings/SuppliersManage/SippliersStockPriceList.vue

@@ -160,6 +160,7 @@ export default {
           ...this.searchData
         }
       }).then((res) => {
+        console.log(res);
         this.tableData = res.data.data
         this.total = res.data.total
       }).catch((err) => { });
@@ -204,7 +205,7 @@ export default {
             onOk: () => {
               this.axios({
                 method: 'get',
-                url: '/api/supply_material_del',
+                url: '/api/supply_material_add',
                 params: {
                   supply_id: row.supply_id
                 }

src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -285,18 +285,19 @@
           >
             <!-- v-show="_item.display" -->
             <!-- v-show="_item.list && _item.list.length > 0" -->
+            <div class="tit_box">
             <span :class="['box-us']" @click="setBoxChange(item, _item)">{{
               _item.type_title
-            }}</span>
+            }}</span></div>
+            <div class="radio-box">
             <div
-              :class="['radio-us', __item.show ? 'radio-us-foc' : '']"
               v-for="__item in _item.list"
               @click="setRadioChange(_item, __item, index, partsItem, item.cld)"
-              v-show="__item.display"
+              :class="['radio-us', __item.show ? 'radio-us-foc' : '']"
               :key="__item.id"
             >
-              {{ __item.title }}
-            </div>
+             {{ __item.title }}
+            </div></div>
           </div>
           <!-- <div class="radio-g">
             <div @click="setRadioChange(item, _item, index, partsItem)"
@@ -2499,7 +2500,11 @@ export default {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    flex-wrap: wrap;
+    .radio-box{
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+       border-left: 1px solid  #dedede;
     .radio-us {
       background: #f4f5f7;
       padding: 5px 20px;
@@ -2514,7 +2519,8 @@ export default {
       color: #3764ff;
       background: #fff;
       border: 1px solid #3764ff;
-    }
+    }}
+    .tit_box{
     .box-us {
       background: #f4f5f7;
       padding: 5px 20px;
@@ -2524,12 +2530,15 @@ export default {
       border-radius: 5px;
       border: 1px solid #dedede;
       cursor: pointer;
+      width: 100px;
+      display: inline-block;
+    text-align: center;
     }
     .box-us-foc {
       color: #3764ff;
       background: #fff;
       border: 1px solid #3764ff;
-    }
+    }}
     .radio-us-none {
       display: none;
     }

src/views/BidSystem/ProductDeOrder/detail.vue

@@ -143,7 +143,7 @@
               ></Option>
             </Select>
           </template>
-          <template slot="supSet" slot-scope="{ row, index }">
+          <template slot="supSet" slot-scope="{ row , index}">
             <!-- <a
               style="margin: 0 5px; color: red"
               v-show="$route.query.type != 3"

src/views/ChipMannage/index.vue

@@ -24,9 +24,9 @@
           <a v-if='persimissionData["绑定详情"]||persimissionData.all'
              @click="chipDetails(row)"
              class="map-margin">绑定详情</a>
-          <a v-if="(row.status!=2)&&(persimissionData['解绑']||persimissionData.all)"
+          <!-- <a v-if="(row.status!=2)&&(persimissionData['解绑']||persimissionData.all)"
              @click="unBind(row)"
-             class="map-margin">解绑</a>
+             class="map-margin">解绑</a> -->
           <a v-if='persimissionData["删除"]||persimissionData.all'
              @click="delItems(row)"
              class="map-margin">删除</a>
@@ -64,7 +64,7 @@ export default {
     return {
       list: [
         {
-          title: '是否绑定', name: 'Select', value: '', serverName: 'status',
+          title: '是否绑定', name: 'Select', value: '', serverName: 'status',disabled:true,
           option: [
             { label: '是', value: 1 },
             { label: '否', value: 0 }
@@ -77,10 +77,10 @@ export default {
         { title: '序号', type: 'index', align: 'center', width: '100', key: '' },
         // {title:'ID',align:'center',key:'id',width:'100'},
         { title: '芯片编号', align: 'center', key: 'tag' },
-        {
-          title: '是否绑定', align: 'center', key: 'pr_id',
-          render: (h, params) => h('span', params.row.status == 0 ? '未绑定' : (params.row.status == 1 ? '已绑定' : '已解绑'))
-        },
+        // {
+        //   title: '是否绑定', align: 'center', key: 'pr_id',
+        //   render: (h, params) => h('span', params.row.status == 0 ? '未绑定' : (params.row.status == 1 ? '已绑定' : '已解绑'))
+        // },
         { title: '操作', align: 'center', slot: 'set', width: '200' },
       ],
       tableData: [],

src/views/OrderMannage/BusinessOrderlist/list.vue

@@ -823,7 +823,7 @@ export default {
           value: "",
           serverName: "salesman",
           optionName: "nickname",
-          optionValue: "id",
+          optionValue: "nickname",
           option: this.users,
         },
         {
@@ -1048,9 +1048,29 @@ export default {
       this.postInfo.order_no = Array.isArray(row)
         ? row.join(",")
         : row.order_no;
+        if(title==="测量"){ this.$Modal.confirm({
+        title: "批量下测量",
+        content: "确定下测量？",
+        onOk: () => {
+          this.axios({
+            method: "post",
+            url,
+            data: {
+              order_no: this.postInfo.order_no,
+            },
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$Message.success(res.msg);
+              this.getData(this.proxyObj);
+            }
+          });
+        },
+        onCancel: () => {},
+      });}
+      else{
       this.$Modal.confirm({
-        title: "确认下生产？",
-        content: "确认",
+        title: "批量下生产",
+        content: "确定下生产？",
         onOk: () => {
           this.axios({
             method: "post",
@@ -1066,7 +1086,7 @@ export default {
           });
         },
         onCancel: () => {},
-      });
+      });}
       // this.dowmMeasurement({
       //   url,
       //   title,

src/views/ProcessLine/index.vue

@@ -556,7 +556,7 @@ export default {
       this.getData(this.proxyObj);
     },
     async exportData() {
-      const res = await this.axios("/api/process_route_index_export", {
+      const res = await this.axios("/api/process_route_export", {
         params: { ...this.proxyObj, page: 0 },
       });
       if (res.code == 200) {

src/views/ProcessRoute/index.vue

@@ -430,7 +430,7 @@ export default {
       });
     },
     async exportData() {
-      const res = await this.axios("/api/process_route_index_export", {
+      const res = await this.axios("/api/process_group_export", {
         params: { ...this.proxyObj, page: 0 },
       });
       if (res.code == 200) {

src/views/ProductionOrderList/Deliverylist/Deliverylist.vue

@@ -35,7 +35,8 @@
         </div>
       </template>
       <template slot="set" slot-scope="{ row }">
-        <a class="map-margin" @click="goPage(row)">详情</a>
+        <a class="map-margin" @click="goPage(row,1)">详情</a>
+         <a class="map-margin" @click="goPage(row,2)">查看异常</a>
         <a
           @click="confirmOutStock(row, 1)"
           v-if="row.state == 0"
@@ -412,7 +413,9 @@ export default {
         cancel: (e) => {},
       });
     },
-    goPage(row) {
+    goPage(row,type) {
+      switch(row,type){
+        case 1:
       this.$router.push({
         path: "/cms/productionorderlist/inboundform/details",
         query: {
@@ -421,6 +424,10 @@ export default {
           transport_no: row.transport_no,
         },
       });
+      break
+      case 2:
+        this.$router.push('/cms/productionorderlist/deliverylist/checkUnusual')
+      }
     },
     goBigScreen(row) {
       this.axios({

src/views/ProductionOrderList/Deliverylist/checkUnusual.vue

@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <FullPage title='异常列表'
+              :list='list'
+              @init='init'
+              :loading='loading'
+              @searchData='init'
+              @changePage='changePage'
+              @changeSize='changeSize'
+              @selectTable='selectTable'
+              :tableColums='tableColums'
+              :tableData='tableData'
+              :pageIndex='pageIndex'
+              :total='total'>
+      <div slot='titleButton'>
+        <Button type="error"
+                @click="approved(0)"
+                style="margin-right:10px;"
+                ghost>返回</Button>
+        <Button type="success"
+                @click="approved(1)"
+                style="margin-right:10px;"
+                ghost>批量确认</Button>
+      </div>
+      <template slot='set'
+                slot-scope='{row}'>
+        <div>
+          <a @click="singleApproved(1,row)"
+             style="margin:0 5px;color:green"
+             v-if="row.state == 0 ">确认</a>
+        </div>
+      </template>
+    </FullPage>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  data () {
+    return {
+      list: [
+        { title: '楼幢', name: 'Input', value: '', serverName: 'oa_order_no', placeholder: '请输入订单号' },
+        { title: '单元', name: 'Input', serverName: 'residential_name', value: '', placeholder: '请输入项目名称' },
+        { title: '楼层', name: 'Input', serverName: 'nickname', value: '', placeholder: '请选择提交人' },
+        {
+          title: '房号', name: 'Select', placeholder: '请选择', value: 0, serverName: 'state',
+          option: [
+            { label: '审核中', value: 0 },
+            { label: '通过', value: 1 },
+            { label: '驳回', value: 2 },
+            // { label: '取消', value: 3 },
+          ]
+        },
+        {
+          title: '产品', name: 'Select', serverName: 'type', placeholder: '请选择', value: '',
+          option: [
+            { label: '请购', value: 1 },
+            { label: '采购', value: 2 },
+            { label: '到货', value: 3 },
+            { label: '质检', value: 4 }
+          ]
+        },
+      { title: '零部件', name: 'Input', value: '', serverName: 'oa_order_no', placeholder: '请输入订单号' },
+      { title: '状态', name: 'Input', value: '', serverName: 'oa_order_no', placeholder: '请输入订单号' },
+      { title: '验收时间', name: 'Input', value: '', serverName: 'oa_order_no', placeholder: '请输入订单号' }
+        // { title: '审批时间', start_server: 'start_time', end_server: 'end_time', name: 'Input', start_value: '', end_value: '', isDate: true, start_placeholder: '开始日期', end_placeholder: '结束日期', },
+      ],
+      tableColums: [
+        { type: 'selection', align: 'center', fixed: 'left', minWidth: 100, },
+        { title: '项目', align: 'center', key: 'oa_order_no', width: '180' },
+        { title: '房间号', align: 'center', key: 'residential_name', minWidth: 100 },
+        // { title: '订单流水号', align: 'center', key: 'oa_order_no', minWidth: 200 },
+        // {title:'订单类型',align:'center',key:'show_order_type',minWidth:100,
+        //     render:(h,params)=>h('span',{},params.row.order_type == 1 ? '工装' : '家装')
+        // },
+        // { title: '客户', align: 'center', key: 'client_name', minWidth: 100 },
+        // { title: '手机号', align: 'center', key: 'mobile', minWidth: 150 },
+        {
+          title: '产品', align: 'center', minWidth: 100,
+          render (h, params) {
+            return h('span', {}, params.row.type == 1 ? '请购' : params.row.type == 2 ? '采购': params.row.type == 3 ? '到货': '质检')
+          }
+        },
+        { title: '零部件', align: 'center', key: 'nickname', minWidth: 100 },
+        {
+          title: '状态', align: 'center', key: 'show_state', minWidth: 100,
+          render (h, params) {
+            return h('span', {
+              props: {},
+              style: {
+                color: params.row.state == 0 ? '#FFA141' : (params.row.state == 1 ? '#32C800' : '#FF5E5C')
+              }
+            }, params.row.state == 0 ? '审核中' : (params.row.state == 1 ? '通过' : (params.row.state == 2 ? '驳回' : '取消')))
+          }
+        },
+        {
+          title: '发货时间', align: 'center', key: 'show_crt_time', minWidth: 200,
+          render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time * 1))
+        },
+        // { title: '创建人员', align: 'center', key: 'nickname', minWidth: 100 },
+        // {
+        //   title: '审批开始时间', align: 'center', key: 'show_crt_time', minWidth: 200,
+        //   render: (h, params) => h('span', {}, this.func.replaceDate(params.row.crt_time * 1))
+        // },
+        // {
+        //   title: '审批结束时间', align: 'center', key: 'show_upd_time', minWidth: 200,
+        //   render: (h, params) => h('span', {}, params.row.upd_time ? this.func.replaceDate(params.row.upd_time * 1) : '')
+        // },
+        // { title: '备注', align: 'center', key: 'remark', minWidth: 200 },
+        { title: '操作', align: 'center', slot: 'set', fixed: 'right', width: '220' },
+      ],
+      tableData: [],
+      pageIndex: 1,
+      total: 0,
+      pageSize: 10,
+      loading: false,
+      proxyObj: {},
+      selectIds: [],
+      currency_type: null,
+    }
+  },
+  created () {
+    this.currency_type = this.$route.query.id;
+  },
+  computed: {
+    ...mapState(['persimissionData'])
+  },
+  watch: {
+    $route (to) {
+      this.id = to.query.id;
+      this.proxyObj.id = this.id
+      this.getData(this.proxyObj)
+      this.currency_type = to.query.id
+    }
+  },
+  methods: {
+    init (row) {
+      this.pageIndex = 1
+      row.page_index = this.pageIndex;
+      row.page_size = this.pageSize
+      this.proxyObj = row;
+      this.getData(row)
+    },
+    getData (row) {
+      this.loading = true;
+      this.axios('/api/order_oa_list', { params: row }).then(res => {
+        this.loading = false;
+        this.tableData = res.data.data;
+        this.total = res.data.total;
+        console.log(res);
+      })
+    },
+    changePage (e) {
+      this.pageIndex = e;
+      this.proxyObj.page_index = this.pageIndex;
+      this.getData(this.proxyObj);
+    },
+    goPage (row) {
+      row.type == 1 ? this.$router.push({
+        // /cms/ordermannage/businessorderlist/details
+        // path:'/cms/ordermannage/businessorderlist/decorationlist',
+        path: '/cms/BidSystem/ContractList/requisitionDetail',
+        query: {
+          oa_order_no: row.oa_order_no,
+          order_no: row.order_no,
+          type: row.type,
+          state: row.state,
+        }
+      }) :row.type == 2 ? this.$router.push({
+        path: '/cms/BidSystem/ContractList/purchaseDetail',
+        query: {
+          oa_order_no: row.oa_order_no,
+          order_no: row.order_no,
+          type: row.type,
+          state: row.state,
+        }
+      }) : row.type == 3 ? this.$router.push({
+        path: '/cms/BidSystem/ContractList/arrivalDetail',
+        query: {
+           oa_order_no: row.oa_order_no,
+          order_no: row.order_no,
+          type: row.type,
+          state: row.state,
+        }
+         }) :  this.$router.push({
+        path: '/cms/BidSystem/ContractList/qualitytestingDetail',
+        query: {
+          oa_order_no: row.oa_order_no,
+          order_no: row.order_no,
+          type: row.type,
+          state: row.state,
+        }
+        })
+    },
+    goDetails (row) {
+      this.$router.push({
+        path: '/cms/approval/examine',
+        query: {
+          oa_order_no: row.oa_order_no
+        }
+      })
+    },
+    changeSize (e) {
+      this.pageSize = e;
+      this.proxyObj.page_size = this.page_size;
+      this.getData(this.proxyObj)
+    },
+    approved (n) {
+      if (this.selectIds.length < 1) {
+        return this.$Message.warning('请至少选择一项')
+      }
+      this.confirmDelete({
+        content: n == 1 ? '是否通过此订单审核？' : '是否驳回此订单审核',
+        title: n == 1 ? '审批通过' : '驳回审批',
+        type: n == 1 ? 'primary' : 'error',
+        then: () => {
+          
+          this.select_post(n, this.selectIds)
+        },
+        cancel: () => { }
+      })
+    },
+    singleApproved (n, row) {
+      console.log(row)
+      this.selectIds = [row.oa_order_no]
+      this.approved(n)
+    },
+    selectTable (e) {
+      this.selectIds = e.reduce((pre, cur) => pre.concat([cur.oa_order_no]), [])
+      console.log('selectIds :>> ', this.selectIds);
+    },
+    select_post (state, arr) {//state(1:通过|2:驳回)
+      let params = { oa_order_no: arr.join(','), state: state }
+      state == 2 ? params.remark = this.remark : '';
+      this.axios.post('/api/order_oa_check', params).then(res => {
+        if (res.code == 200) {
+          this.$Message.success(res.msg || '无提示')
+          this.getData(this.proxyObj)
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.nav {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.item-attr {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+</style>

src/views/ProductionOrderList/ProductionPlanlist/details.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <FullPage
-      title="订单详情"
+      title="生产计划详情"
       :list="list"
       @init="init"
       :logList="logList"
@@ -93,12 +93,12 @@ export default {
           option: [{ label: 1, value: 1 }],
         },
         {
-          title: "房间",
+          title: "房号",
           name: "Select",
           multiple: true,
           filterable: true,
           serverName: "number_detail",
-          placeholder: "请选择房间",
+          placeholder: "请选择房号",
           value: "",
           option: [{ label: 1, value: 1 }],
         },
@@ -122,12 +122,12 @@ export default {
           option: [],
         },
         {
-          title: "产品",
+          title: "产品名称",
           name: "Select",
           multiple: true,
           filterable: true,
           serverName: "product",
-          placeholder: "请选择产品",
+          placeholder: "请选择产品名称",
           value: "",
           option: [],
         },
@@ -141,11 +141,21 @@ export default {
           placeholder: "请选择图号",
           option: [],
         },
+         {
+          title: "是否完成",
+          name: "Select",
+          multiple: true,
+          filterable: true,
+          value: "",
+          serverName: "img_number",
+          placeholder: " ",
+          option: [{ label: '否', value: 0 },{ label: '是', value: 1 }],
+        },
       ],
       tableColums: [
         { type: "selection", align: "center", fixed: "left", width: "100" },
         {
-          title: "房间号",
+          title: "房号",
           align: "center",
           key: "number_detail",
           minWidth: 100,
@@ -196,7 +206,7 @@ export default {
         //   key: "position",
         //   minWidth: 100,
         // },
-        { title: "产品", align: "center", key: "product_title", minWidth: 200 },
+        { title: "产品名称", align: "center", key: "product_title", minWidth: 200 },
         { title: "部件", align: "center", key: "part_title", minWidth: 200 },
         {
           title: "部件是否贴标签",
@@ -353,6 +363,7 @@ export default {
     getData(row) {
       this.axios("/api/orders_procedure_list", { params: row }).then((res) => {
         this.logList = res.data.detail;
+        console.log(res)
         this.tableData = res.data.list;
         this.total = res.data.total;
       });

src/views/PurchasingManage/ArrivalOrder/list.vue

@@ -204,6 +204,13 @@ export default {
   mounted () {
     this.initData()
   },
+  beforeRouteEnter(to,from,next){
+       next(vm=>{
+         if(from.name === 'ArrivalOrderEdit'){
+           vm.initData()
+         }
+       })
+  },
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -143,7 +143,7 @@
         <div class="content_table_btn_right">
         </div>
       </div>
-      <Table :columns="tableColumns"
+      <Table :columns="$route.query.type == 2?tableColumns_detailed:tableColumns"
              border
              :data="tableData"
              show-summary :summary-method="handleSummary"
@@ -403,6 +403,20 @@ export default {
         ],
         tableData: [{}]
       },
+      tableColumns_detailed:[ { title: '物料分类', key: 'type_title', align: 'center', minWidth: 140 },
+        { title: '物料名称', key: 'title', align: 'center', minWidth: 140 },
+        {
+          title: '物料规格', key: '', align: 'center', minWidth: 140,
+          render: (h, params) => {
+            const { row } = params
+            let text = `${row.long ? row.long : 0}*${row.width ? row.width : 0}*${row.high ? row.high : 0}`
+            return h('span', {}, text)
+          }
+        },
+        { title: '计量单位', key: 'unit', align: 'center', minWidth: 100 },
+        {
+          title: '入库数量', key: 'num', align: 'center', minWidth: 120,slot:"numberSet"
+        }],
       tableColumns: [
         { title: '物料分类', key: 'type_title', align: 'center', minWidth: 140 },
         { title: '物料名称', key: 'title', align: 'center', minWidth: 140 },
@@ -672,7 +686,7 @@ export default {
                     if (index === 0) {
                         sums[key] = {
                             key,
-                            value: '总价'
+                            value: '合计'
                         };
                         return;
                     }
@@ -728,7 +742,6 @@ export default {
         const data = JSON.parse(JSON.stringify(res.data))
         delete data.list
         this.searchData = data
-        console.log(this.searchData)
       }).catch((err) => { });
     },
     postData () {

src/views/PurchasingManage/OutstockOrder/edit.vue

@@ -134,7 +134,7 @@
         </div>
         <div class="content_table_btn_right"></div>
       </div>
-      <Table :columns="tableColumns" border :data="tableData" show-summary :summary-method="handleSummary">
+      <Table :columns="$route.query.type == 2?tableColumns_detailed:tableColumns" border :data="tableData" show-summary :summary-method="handleSummary">
         <template slot="setSlot" slot-scope="{ row, index }">
           <a
             style="margin: 0 5px"
@@ -408,6 +408,40 @@ export default {
         ],
         tableData: [{}],
       },
+      tableColumns_detailed:[{
+          title: "物料分类",
+          key: "type_title",
+          align: "center",
+          minWidth: 140,
+        },
+        { title: "物料名称", key: "title", align: "center", minWidth: 140 },
+        {
+          title: "物料规格",
+          key: "",
+          align: "center",
+          minWidth: 140,
+          render: (h, params) => {
+            const { row } = params;
+            let text = `${row.long ? row.long : 0}*${
+              row.width ? row.width : 0
+            }*${row.high ? row.high : 0}`;
+            return h("span", {}, text);
+          },
+        },
+        { title: "计量单位", key: "unit", align: "center", minWidth: 100 },
+        {
+          title: "出库数量",
+          key: "num",
+          align: "center",
+          minWidth: 120,
+          render: (h, params) => {
+            const { row, index } = params;
+            const currentRow = JSON.parse(
+              JSON.stringify(this.tableData[index])
+            );
+            return h("span", {},currentRow.num);
+          },
+        }],
       tableColumns: [
         {
           title: "物料分类",
@@ -718,7 +752,7 @@ export default {
                     if (index === 0) {
                         sums[key] = {
                             key,
-                            value: '总价'
+                            value: '合计'
                         };
                         return;
                     }

src/views/PurchasingManage/OutstockOrder/list.vue

@@ -228,7 +228,6 @@ export default {
           page_size: this.pageSize
         }
       }).then((res) => {
-        console.log(res)
         this.tableData = res.data.data
         this.total = res.data.total
       }).catch((err) => { });

src/views/PurchasingManage/PurchasingOrder/edit.vue

@@ -815,6 +815,8 @@ export default {
             this.btn_disable = true
           });
           this.tableData = [...this.tableData, ...result]
+          this.searchData.residential_name = result[0].residential_name
+          // console.log(result)
         }
       })
     },
@@ -842,6 +844,9 @@ export default {
       this.tableData = [...this.tableData, ...this.modalData.selectedData]
       this.table_state = 0
       this.btn1_disable = true
+      this.tableData.map((item,index)=>{
+        item.residential_name = this.currentChoose.residential_name
+        this.tableData.splice(index,1,item) })
     },
     changeModalSize (e) {
       this.modal_page_size = e;
@@ -888,6 +893,11 @@ export default {
     handleProjectSelect () {
       this.searchData.residential_name = this.currentChoose.residential_name
       this.searchData.order_no = this.currentChoose.order_no
+      this.tableData[0].residential_name = this.currentChoose.residential_name
+      this.tableData.map((item,index)=>{
+        item.residential_name = this.currentChoose.residential_name
+        this.tableData.splice(index,1,item)
+      })
     },
     handleSupplierSelect () {
       this.searchData.supply_title = this.currentChoose.title

src/views/PurchasingManage/PurchasingOrder/list.vue

@@ -114,7 +114,7 @@
         <Table :columns="tableColumns"
                border
                :max-height="500"
-               :data="tableData">
+               :data="historyTableData">
           <template slot="setSlot"
                     slot-scope="{row,index}">
             <a style="margin:0 5px"
@@ -210,6 +210,7 @@ export default {
         { title: '操作', key: 'code', align: 'center', minWidth: 200, slot: 'setSlot' },
       ],
       tableData: [{}],
+      historyTableData:[],
       pageIndex: 1,
       pageSize: 10,
       total: 0,
@@ -234,6 +235,13 @@ export default {
     }
     next();
   },
+  beforeRouteEnter(to,from,next){
+          next(vm =>{
+          if(from.name === 'PurchasingOrderEdit'){
+            vm.initData()
+          }
+          })
+  },
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))
@@ -247,6 +255,7 @@ export default {
         }
       }).then((res) => {
         this.tableData = res.data.data
+        this.historyTableData = this.tableData.slice(0,this.pageSize)
         this.total = res.data.total
       }).catch((err) => { });
     },
@@ -313,13 +322,18 @@ export default {
       this.pageSize = e;
       this.initData()
     },
-    changePage (e) {
-      this.pageIndex = e;
-      this.initData()
+    changePage (index) {
+      this.pageIndex = index;
+      let _start = (index - 1)*this.pageSize;
+      let _end = index * this.pageSize;
+      // this.initData()
+      this.historyTableData = this.tableData.slice(_start,_end)
     }
   },
   // 监听属性 类似于data概念
-  computed: {},
+  computed: {
+
+  },
   // 监控data中的数据变化
   watch: {},
   beforeCreate () { }, // 生命周期 - 创建之前

src/views/PurchasingManage/QualitycontrolOrder/edit.vue

@@ -339,7 +339,7 @@ export default {
         },
         { title: '计量单位', key: 'unit', align: 'center', minWidth: 100 },
         {
-          title: '到货数量', key: 'num', align: 'center', minWidth: 120,
+          title: '质检数量', key: 'num', align: 'center', minWidth: 120,
           render: (h, params) => {
             const { row, index } = params
             const currentRow = JSON.parse(JSON.stringify(this.tableData[index]))
@@ -585,7 +585,6 @@ export default {
         type, refer_type,
         title: refer_type == 1 ? '参照采购单' : '参照到货单',
         then: (result, data) => {
-          console.log('result :>> ', result);
           result.forEach(element => {
             element.type = refer_type
           });

src/views/PurchasingManage/QualitycontrolOrder/list.vue

@@ -206,6 +206,13 @@ export default {
   mounted () {
     this.initData()
   },
+  beforeRouteEnter(to,from,next){
+          next(vm=>{
+          if(from.name === 'QualitycontrolOrderEdit'){
+            vm.initData()
+          }
+          })
+},
   methods: {
     initData () {
       let obj = JSON.parse(JSON.stringify(this.searchData))

src/views/Warehouse/Warehouse/list.vue

@@ -200,7 +200,7 @@ export default {
       })
     },
     async exportData () {
-      const res = await this.axios('/api/procedure_index_export', { params: { ...this.proxyObj } })
+      const res = await this.axios('/api/warehouse_export', { params: { ...this.proxyObj } })
       if (res.code == 200) {
         let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
         location.href = url