src/App.vue

@@ -8,7 +8,7 @@
 export default {
   name: 'App',
   beforeCreate(){
-    document.title = this.$store.state.ip=='http://121.41.102.225:82'?'九方测试服':this.$store.state.ip=='http://121.37.173.82:82'?'倍思特':this.$store.state.ip=='http://124.71.176.88:882'?'金立方':this.$store.state.ip=='http://124.71.176.88:70'?'森兰九鼎':this.$store.state.ip=='http://121.41.102.225:999'?'上线服务器':this.$store.state.ip=='http://hxy_api.qingyaokeji.com'?'华信源':'九方软件';
+    document.title = this.$store.state.ip=='http://121.41.102.225:82'?'九方测试服':this.$store.state.ip=='http://121.37.173.82:82'?'倍思特':this.$store.state.ip=='http://124.71.176.88:882'?'金立方':this.$store.state.ip=='http://124.71.176.88:70'?'森兰九鼎':this.$store.state.ip=='http://121.41.102.225:999'?'上线服务器':this.$store.state.ip=='http://hxyapi.qingyaokeji.com'?'华信源':'九方软件';
   }
 }
 </script>
@@ -40,6 +40,5 @@ table-edit-set{margin-right:10px;color:#3764FF;cursor:pointer}
 .ivu-table-fixed-header{
   .ivu-table-cell-with-selection{&::after{content: '全选';}}
 }
-ul li{list-style: none;;}
-
+ul li{list-style: none;}
 </style>

src/axios/index.js

@@ -1,11 +1,11 @@
 import axios from "axios";
 
 import Vue from "vue";
-
+let config;
 const instance = axios.create(config);
 
 // 3. 配置信息
-let config = {
+config = {
   // 每次请求的协议、IP地址。  设置该配置后，每次请求路径都可以使用相对路径，例如"/admin/login"
   // baseURL: "http://127.0.0.1:5590",
   // 请求超时时间
@@ -16,10 +16,10 @@ let config = {
 
 //请求拦截，后期可能会用到，先注册在此
 instance.interceptors.request.use(
-  function(config) {
-    if(config.url != '/api/bst_get_plan_time'&&config.url != '/api/total_area'){
+  function (config) {
+    if (config.url != '/api/bst_get_plan_time' && config.url != '/api/total_area') {
 
-    Vue.prototype.$loading.show();
+      Vue.prototype.$loading.show();
     }
     let token = localStorage.getItem("token");
     // let proxy_url = 'http://121.37.173.82:82'; //打包上线时请改用此处
@@ -31,7 +31,7 @@ instance.interceptors.request.use(
     config.headers["Authorization"] = token;
     return config;
   },
-  function(error) {
+  function (error) {
     // 对请求错误做些什么
     return Promise.reject(error);
   }

src/components/Topsearch/index.vue

@@ -19,7 +19,7 @@
         :multiple="item.multiple"
         v-model="item.value"
         :type="item.type"
-        v-if="!item.isDate&&!item.isTooltip"
+        v-if="!item.isDate && !item.isTooltip"
         :style="item.width ? 'width:' + item.width + 'px' : ''"
         @on-change="item.change ? change($event, index) : ''"
       >
@@ -29,49 +29,52 @@
           :label="_item.label"
         ></Checkbox>
         <Option
-         v-for="(_item, _index) in item.option"
+          v-for="(_item, _index) in item.option"
           :key="_index"
           :label="item.optionName ? _item[item.optionName] : _item.label"
           :value="item.optionValue ? _item[item.optionValue] : _item.value"
         ></Option>
       </div>
-      <Tooltip v-if="item.isTooltip" transfer max-width='500' placement="right">
-         <div
-        :class="[
-          'margin',
-          item.name == 'Radio' || item.name == 'CheckboxGroup'
-            ? 'checkbox-item'
-            : '',
-        ]"
-        :key="index"
-        :is="item.name"
-        :size="item.size ? item.size : 'small'"
-        :placeholder="item.placeholder"
-        :clearable="!item.clearable ? true : false"
-        :disabled="item.disabled"
-        :filterable="item.filterable"
-        :multiple="item.multiple"
-        v-model="item.value"
-        :type="item.type"
-        :max-tag-count='1'
-        v-if="!item.isDate"
-        :style="item.width ? 'width:' + item.width + 'px' : ''"
-        @on-change="item.change ? change($event, index) : ''"
-      >
-      <Option v-if="!item.showChooseAll"
-      :label="item.chooseAll?'取消':'全选'"
-      value="全选"
-      @click.native="total_choose"
-      >
-      </Option>
-        <Option
-         v-for="(_item, _index) in item.option"
-          :key="_index"
-          :label="item.optionName ? _item[item.optionName] : _item.label"
-          :value="item.optionValue ? _item[item.optionValue] : _item.value"
-        ></Option>
-      </div>
-      <div slot="content">{{tooltip_data?tooltip_data:item.value.toString()}}</div>
+      <Tooltip v-if="item.isTooltip" transfer max-width="500" placement="right">
+        <div
+          :class="[
+            'margin',
+            item.name == 'Radio' || item.name == 'CheckboxGroup'
+              ? 'checkbox-item'
+              : '',
+          ]"
+          :key="index"
+          :is="item.name"
+          :size="item.size ? item.size : 'small'"
+          :placeholder="item.placeholder"
+          :clearable="!item.clearable ? true : false"
+          :disabled="item.disabled"
+          :filterable="item.filterable"
+          :multiple="item.multiple"
+          v-model="item.value"
+          :type="item.type"
+          :max-tag-count="1"
+          v-if="!item.isDate"
+          :style="item.width ? 'width:' + item.width + 'px' : ''"
+          @on-change="item.change ? change($event, index) : ''"
+        >
+          <Option
+            v-if="!item.showChooseAll"
+            :label="item.chooseAll ? '取消' : '全选'"
+            value="全选"
+            @click.native="total_choose"
+          >
+          </Option>
+          <Option
+            v-for="(_item, _index) in item.option"
+            :key="_index"
+            :label="item.optionName ? _item[item.optionName] : _item.label"
+            :value="item.optionValue ? _item[item.optionValue] : _item.value"
+          ></Option>
+        </div>
+        <div slot="content">
+          {{ tooltip_data ? tooltip_data : item.value.toString() }}
+        </div>
       </Tooltip>
       <div class="items" v-if="item.isDate">
         <DatePicker
@@ -91,18 +94,22 @@
         ></DatePicker>
       </div>
     </div>
-    <Button v-if="showbtn" @click="searchData" :type="btnType" :size="btn_size?btn_size:'small'">{{
-      btnName
-    }}</Button>
+    <Button
+      v-if="showbtn"
+      @click="searchData"
+      :type="btnType"
+      :size="btn_size ? btn_size : 'small'"
+      >{{ btnName }}</Button
+    >
   </div>
 </template>
 
 <script>
 export default {
   props: {
-    btn_size:{
-           type:String,
-           default:'default'
+    btn_size: {
+      type: String,
+      default: 'default'
     },
     list: {
       // type:Array,
@@ -120,8 +127,8 @@ export default {
       type: Boolean,
       default: true,
     },
-    tooltip_data:{
-      
+    tooltip_data: {
+
     }
   },
   data() {
@@ -130,19 +137,19 @@ export default {
   created() {
     window.addEventListener('keydown', this.handleKeyDown, true) //开启监听键盘按下事件
   },
-  destroyed(){
-    window.removeEventListener('keydown',this.handleKeyDown);
+  destroyed() {
+    window.removeEventListener('keydown', this.handleKeyDown);
   },
   mounted() {
     let obj = {}
     this.$emit('init', this.filterDats(obj))
   },
   methods: {
-    total_choose(){
-        this.$emit('total_choose', this.list)
+    total_choose() {
+      this.$emit('total_choose', this.list)
     },
-    change(e,index) {
-      this.$emit('changeSelected', this.list,e,index)
+    change(e, index) {
+      this.$emit('changeSelected', this.list, e, index)
     },
     searchData() {
       let obj = {}
@@ -153,7 +160,7 @@ export default {
     setDate(time) {
       let data = ''
       if (Object.prototype.toString.call(time) === '[object Date]') {
-        data = new Date(time).toLocaleDateString().replace(/\//g, '-')
+        data = new Date(time).toLocaleDateString()
       }
       return data
     },
@@ -164,11 +171,11 @@ export default {
           obj[v.end_server] = this.setDate(v.end_value)
         }
         if (Object.prototype.toString.call(v.value) === '[object Date]') {
-          v.value = new Date(time).toLocaleDateString().replace(/\//g, '-')
+          v.value = new Date(time).toLocaleDateString()
         }
         v.serverName
           ? (obj[v.serverName] =
-              typeof v.value === 'number' && v.value === 0 ? 0 : v.value)
+            typeof v.value === 'number' && v.value === 0 ? 0 : v.value)
           : ''
         if (v.value == 'null') {
           obj[v.serverName] = null
@@ -202,7 +209,7 @@ export default {
   display: inline-block;
 }
 .iten-title {
-  font-size:16px;
+  font-size: 16px;
   color: #333;
 }
 </style>

src/components/currencyPage/index.vue

@@ -6,27 +6,24 @@
 
     <div class="page-edit">
       <div class="nav">
-        <Topsearch v-if="showTopSearch"
-                   :showbtn="showbtn"
-                   :btn_size='btn_size'
-                   @changeSelected="changeSelected"
-                   :list="list"
-                   @init="init"
-                   @searchData="searchData"
-                   :tooltip_data='tooltip_data'
-                   @total_choose='total_choose'
-                   >
+        <Topsearch
+          v-if="showTopSearch"
+          :showbtn="showbtn"
+          :btn_size="btn_size"
+          @changeSelected="changeSelected"
+          :list="list"
+          @init="init"
+          @searchData="searchData"
+          :tooltip_data="tooltip_data"
+          @total_choose="total_choose"
+        >
         </Topsearch>
         <div style="padding-bottom: 15px">
           <slot name="navButton"></slot>
         </div>
       </div>
-      <div v-if="logList"
-           slot="text-list"
-           class="log-list">
-        <div class="log-item"
-             v-for="(item, index) of logList"
-             :key="index">
+      <div v-if="logList" slot="text-list" class="log-list">
+        <div class="log-item" v-for="(item, index) of logList" :key="index">
           <span>{{ item.key }}：</span>
           <span :style="item.color ? 'color:' + item.color : ''">{{
             item.value
@@ -36,53 +33,48 @@
       <div>
         <slot name="text-list"></slot>
       </div>
-      <Table ref="table"
-             v-if="showTable"
-             :width="tableWidth"
-             :loading="loading"
-             :disabled-hover="disabledHover"
-             @on-selection-change="selectTable"
-             @on-select='select'
-             @on-select-cancel='selectTableCancel'
-             @on-select-all-cancel='selectTableAllCancel'
-             :stripe="stripe"
-             border
-             :size="size"
-             :columns="tableColums"
-             :data="tableData">
-        <template slot-scope="{ row }"
-                  slot="set">
-          <slot name="set"
-                :row="row"></slot>
+      <Table
+        ref="table"
+        v-if="showTable"
+        :width="tableWidth"
+        :loading="loading"
+        :disabled-hover="disabledHover"
+        @on-selection-change="selectTable"
+        @on-select="select"
+        @on-select-cancel="selectTableCancel"
+        @on-select-all-cancel="selectTableAllCancel"
+        :stripe="stripe"
+        border
+        :row-class-name="rowClassName"
+        :size="size"
+        :columns="tableColums"
+        :data="tableData"
+      >
+        <template slot-scope="{ row }" slot="set">
+          <slot name="set" :row="row"></slot>
         </template>
-        <template slot-scope="{ row }"
-                  slot="basicTypeSet">
-          <slot name="basicTypeSet"
-                :row="row"></slot>
+        <template slot-scope="{ row }" slot="basicTypeSet">
+          <slot name="basicTypeSet" :row="row"></slot>
         </template>
-         <template slot-scope="{ row,index }"
-                  slot="urlSet">
-          <slot name="urlSet"
-                :row="row"
-                :index='index'></slot>
+        <template slot-scope="{ row, index }" slot="urlSet">
+          <slot name="urlSet" :row="row" :index="index"></slot>
         </template>
-         <template slot-scope="{ row,index }"
-                  slot="fashion">
-          <slot name="fashion"
-                :row="row"
-                :index='index'></slot>
+        <template slot-scope="{ row, index }" slot="fashion">
+          <slot name="fashion" :row="row" :index="index"></slot>
         </template>
       </Table>
 
       <slot></slot>
     </div>
     <slot name="pageSlot"></slot>
-    <Footer v-if="showPage"
-            :pageIndex="pageIndex"
-            :total="total"
-            :pageSize="pageSize"
-            @changeSize="changeSize"
-            @change="changePage" />
+    <Footer
+      v-if="showPage"
+      :pageIndex="pageIndex"
+      :total="total"
+      :pageSize="pageSize"
+      @changeSize="changeSize"
+      @change="changePage"
+    />
   </div>
 </template>
 
@@ -94,12 +86,12 @@ export default {
       // type:Array,
       // default:null,
     },
-    btn_size:{
-         type:String,
+    btn_size: {
+      type: String,
     },
-    keep:{
-      type:Boolean,
-      default:false,
+    keep: {
+      type: Boolean,
+      default: false,
     },
     tableColums: {
       type: Array,
@@ -159,18 +151,21 @@ export default {
       type: Boolean,
       default: true,
     },
-    tooltip_data:{
+    tooltip_data: {
 
+    },
+    choose_index: {
+      default: []
     }
   },
-  data () {
+  data() {
     return {
       tableWidth: null,
       tableHeight: null,
     }
   },
-  created () { },
-  mounted () {
+  created() { },
+  mounted() {
     this.$nextTick(() => {
       if (this.showTable) {
         this.tableWidth = window.innerWidth - 350
@@ -204,42 +199,50 @@ export default {
       })
     }
   },
-  destroyed () {
+  destroyed() {
     window.removeEventListener('resize', (e) => {
       this.tableWidth = e.target.innerWidth - 350
     })
   },
   methods: {
     ...mapActions(['updata_permission']),
-    init (row) {
+    rowClassName(row, index) {
+      if (this.choose_index.find(v => v == index + 1)) {
+        return 'demo-table-info-row';
+      } else {
+        return '';
+      }
+
+    },
+    init(row) {
       this.$emit('init', row)
     },
-    searchData (row) {
+    searchData(row) {
       this.$emit('searchData', row)
     },
-    total_choose(e){
-       this.$emit('total_choose',e)
+    total_choose(e) {
+      this.$emit('total_choose', e)
     },
-    changePage (e) {
+    changePage(e) {
       this.$emit('changePage', e)
     },
-    selectTable (e) {
+    selectTable(e) {
       this.$emit('selectTable', e)
     },
-    changeSize (e) {
+    changeSize(e) {
       this.$emit('changeSize', e)
     },
-    changeSelected (e) {
+    changeSelected(e) {
       this.$emit('changeSelected', e)
     },
-    selectTableCancel(e,row){
-      this.$emit('selectTableCancel',e,row)
+    selectTableCancel(selection, row) {
+      this.$emit('selectTableCancel', selection, row)
     },
-    select(e,row){
-      this.$emit('select',e,row)
+    select(e, row) {
+      this.$emit('select', e, row)
     },
-    selectTableAllCancel(e){
-      this.$emit('selectTableAllCancel',e)
+    selectTableAllCancel(e) {
+      this.$emit('selectTableAllCancel', e)
     }
   },
 }
@@ -258,4 +261,8 @@ export default {
   top: 0px;
   height: 80%;
 }
+/deep/.ivu-table .demo-table-info-row td {
+  background-color: #63c1ed !important;
+  color: #fff;
+}
 </style>

src/routerMap/index.js

@@ -63,7 +63,7 @@ const routerMap = [
     meta: {
       index: 2,
       NoPadding: true,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/Finance/productionCharts/index"], resolve),
@@ -183,6 +183,14 @@ const routerMap = [
     component: (resolve) => require(["@/views/PartsMannage/edit"], resolve),
   },
   {
+    path: "/cms/materialmannage/yongyouIndex",
+    name: "yongYouMaterialMannage", //新物料档案
+    meta: {
+      index: 4,
+    },
+    component: (resolve) => require(["@/views/MaterialMannage/yongyouIndex"], resolve),
+  },
+  {
     path: "/cms/materialmannage/index",
     name: "MaterialMannage", //物料管理-->部件列表
     meta: {
@@ -319,7 +327,7 @@ const routerMap = [
     name: "checkUnusual", //生产订单列表-->出库表-->查看异常
     meta: {
       index: 4,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require([
@@ -353,7 +361,7 @@ const routerMap = [
     name: "DispatchlistList", //生产订单列表-->派工单
     meta: {
       index: 4,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProductionOrderList/Dispatchlist/list"], resolve),
@@ -363,7 +371,7 @@ const routerMap = [
     name: "workOverList", //生产订单列表-->返工单
     meta: {
       index: 4,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProductionOrderList/workOver/list"], resolve),
@@ -373,7 +381,7 @@ const routerMap = [
     name: "workOverListDetails", //生产订单列表-->返工单-->详情
     meta: {
       index: 4,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProductionOrderList/workOver/details"], resolve),
@@ -458,7 +466,7 @@ const routerMap = [
     name: "bstProductionOrderList", //生产订单列表-->生产订单列表
     meta: {
       index: 4,
-      keepAlive:true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/ProductionOrderList/ProductionsOrder/BST_list"], resolve),
@@ -565,7 +573,7 @@ const routerMap = [
     name: "Approvallist", //审批-->审批列表
     meta: {
       index: 4,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) => require(["@/views/Approval/list"], resolve),
   },
@@ -625,7 +633,7 @@ const routerMap = [
     name: "MountOrder", //安装订单
     meta: {
       index: 1,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) => require(["@/views/MountOrder/index"], resolve),
   },
@@ -691,7 +699,7 @@ const routerMap = [
     name: "ProjectProgressMannage", //项目进度列表
     meta: {
       index: 1,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProjectProgressMannage/list"], resolve),
@@ -710,7 +718,7 @@ const routerMap = [
     name: "ProjectProgressSummary", // 项目进度汇总表
     meta: {
       index: 1,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProjectProgressSummary/list"], resolve),
@@ -803,7 +811,7 @@ const routerMap = [
     name: "BidSystemDeepeningOrderNewEdit", // 深化单->新增，编辑，详情  7.8下沙
     meta: {
       index: 3,
-      keepAlive:true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/BidSystem/DeepeningOrder/newEdit"], resolve),
@@ -1187,7 +1195,7 @@ const routerMap = [
     name: "extraCostsList", //采购模块-->项目杂费
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/extraCosts/list"], resolve),
@@ -1235,7 +1243,7 @@ const routerMap = [
     name: "ArrivalOrderList", //采购模块-->到货单列表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/ArrivalOrder/list"], resolve),
@@ -1254,7 +1262,7 @@ const routerMap = [
     name: "QualitycontrolOrderList", //采购模块-->到货单列表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/QualitycontrolOrder/list"], resolve),
@@ -1274,7 +1282,7 @@ const routerMap = [
     name: "InstockOrderList", //采购模块-->入库单列表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/InstockOrder/list"], resolve),
@@ -1386,7 +1394,7 @@ const routerMap = [
     name: "ProductionInWarehouseList", //供应链管理-->生产入库列表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/ProductionInWarehouse/list"], resolve),
@@ -1396,7 +1404,7 @@ const routerMap = [
     name: "DeliveryOutWarehouseList", //供应链管理-->发货出库列表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/DeliveryOutWarehouse/list"], resolve),
@@ -1461,7 +1469,7 @@ const routerMap = [
     name: "stockingTable", // 仓库管理→库存台账
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/Warehouse/Warehouse/stockingTable"], resolve),
@@ -1565,7 +1573,7 @@ const routerMap = [
     name: "DispatchedList", // 分类派工→派工单查询
     meta: {
       index: 3,
-      keepAlive:true,
+      keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/Dispatching/DispatchedList"], resolve),
@@ -1795,7 +1803,7 @@ const routerMap = [
     name: "RoomListBST", //房间列表(倍思特)
     meta: {
       index: 3,
-      // keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/roomList/BSTlist"], resolve),
@@ -1863,6 +1871,7 @@ const routerMap = [
     name: "BSTWeightMemoList", //码单列表(倍思特)
     meta: {
       index: 3,
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/leadMatch/weightMemo/BSTlist"], resolve),
@@ -2435,8 +2444,7 @@ const routerMap = [
     path: "/cms/Agreement/list",
     name: "AgreementList", //合同-->合同列表
     meta: {
-      index: 3,
-      keepAlive:true
+      index: 3
     },
     component: (resolve) =>
       require(["@/views/Agreement/list"], resolve),
@@ -2454,8 +2462,7 @@ const routerMap = [
     path: "/cms/Agreement/match/list",
     name: "MatchList", //合同-->匹配-->匹配列表
     meta: {
-      index: 3,
-      keepAlive:true
+      index: 3
     },
     component: (resolve) =>
       require(["@/views/Agreement/match/list"], resolve),
@@ -2482,8 +2489,7 @@ const routerMap = [
     path: "/cms/Agreement/deepen/list",
     name: "deepenList", //合同-->合同列表-->深化单-->列表
     meta: {
-      index: 3,
-      keepAlive:true
+      index: 3
     },
     component: (resolve) =>
       require(["@/views/Agreement/deepen/list"], resolve),
@@ -2547,7 +2553,7 @@ const routerMap = [
     name: "productMessageList", //生产通知单
     meta: {
       index: 3,
-      keepAlive:true
+      // keepAlive:true
     },
     component: (resolve) =>
       require(["@/views/Agreement/productMessage/list"], resolve),
@@ -2575,7 +2581,7 @@ const routerMap = [
     name: "productValueList", //产值表
     meta: {
       index: 3,
-      keepAlive:true
+      keepAlive: true
     },
     component: (resolve) =>
       require(["@/views/ProductValue/list"], resolve),
@@ -2626,41 +2632,41 @@ const routerMap = [
       require(["@/views/stack/confirm"], resolve),
   },
   {
-         path:"/cms/ErrorList/index",
-         name:"ErrorListIndex",//异常预警表-->列表
-         meta:{
-          index:3,
-         },
-         component:(resolve)=>
-          require(["@/views/ErrorList/index"],resolve),
-      },
-      {
-        path:"/cms/ErrorList/detail",
-        name:"ErrorListDetail",//异常预警表-->列表-->详情
-        meta:{
-         index:3,
-        },
-        component:(resolve)=>
-         require(["@/views/ErrorList/detail"],resolve),
-     },
-     {
-      path:"/cms/BasicSettings/SearchWork",
-      name:"SearchWork",//查询派工单
-      meta:{
-       index:3,
-      },
-      component:(resolve)=>
-       require(["@/views/BasicSettings/SearchWork"],resolve),
-   },
-   {
-    path:"/cms/BasicSettings/MaterialRequisition",
-    name:"MaterialRequisition",//查询开料单
-    meta:{
-     index:3,
-    },
-    component:(resolve)=>
-     require(["@/views/BasicSettings/MaterialRequisition"],resolve),
- },
+    path: "/cms/ErrorList/index",
+    name: "ErrorListIndex",//异常预警表-->列表
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/ErrorList/index"], resolve),
+  },
+  {
+    path: "/cms/ErrorList/detail",
+    name: "ErrorListDetail",//异常预警表-->列表-->详情
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/ErrorList/detail"], resolve),
+  },
+  {
+    path: "/cms/BasicSettings/SearchWork",
+    name: "SearchWork",//查询派工单
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/BasicSettings/SearchWork"], resolve),
+  },
+  {
+    path: "/cms/BasicSettings/MaterialRequisition",
+    name: "MaterialRequisition",//查询开料单
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/BasicSettings/MaterialRequisition"], resolve),
+  },
   // 测试用
   {
     path: "/cms/ordermannage/businessorderlist/editcopy",

src/views/Agreement/deepen/list.vue

@@ -114,16 +114,6 @@ export default {
             }
         }
     },
-    beforeRouteLeave(to, from, next) {
-      if (
-        to.path == "/cms/Agreement/deepen/edit"
-      ) {
-        next();
-      } else {
-        from.meta.keepAlive = false;
-        next();
-      }
-    }
 }
 </script>
 <style lang="scss" scoped>

src/views/Agreement/list.vue

@@ -240,7 +240,7 @@ export default {
                data.start_time = data.start_time?Date.parse(data.start_time).toString().slice(0,10):'';
                data.end_time = data.end_time?Date.parse(data.end_time).toString().slice(0,10):'';
             }
-             this.axios.post('/api/contract_list',{...data}).then(res=>{
+             this.axios.post('/api/contract_list',{...data,page_size:this.pageSize,page_index:this.pageIndex}).then(res=>{
                  this.tableData = res.data.data;
                  this.total = res.data.total
              })
@@ -256,16 +256,6 @@ export default {
         }
 
     },
-      beforeRouteLeave(to, from, next) {
-    if (
-      to.path == "/cms/Agreement/edit"
-    ) {
-      next();
-    } else {
-      from.meta.keepAlive = false;
-      next();
-    }
-      }
 }
 </script>
 <style lang="scss" scoped>

src/views/Agreement/match/check.vue

@@ -29,7 +29,7 @@
         <span>项目名称：</span><span>{{ detailList.abbreviation }}</span>
       </Col>
       <Col span="4">
-        <span>项目简介：</span><span>{{ detailList.project_title }}</span>
+        <span>项目简称：</span><span>{{ detailList.project_title }}</span>
       </Col>
     </Row>
     <div class="context-tabs">

src/views/Agreement/match/list.vue

@@ -100,7 +100,7 @@ export default {
                         width: 350
         },
        {
-          title: "项目简介",
+          title: "项目简称",
           align: "center",
           key: "project_title",
           resizable: true,

src/views/Agreement/match/matching.vue

@@ -16,6 +16,7 @@
         style="margin-right: 10px"
         >撤销匹配</Button
       >
+      <Button type="primary" @click="handleAutoMatch" style="margin-right: 10px" v-show="currencyTag==1">自动匹配</Button>
       <Button @click="back" type="primary" ghost style="margin-right: 10px"
         >返回</Button
       >
@@ -33,7 +34,7 @@
           <span>项目名称：</span><span>{{ detailList.abbreviation }}</span>
         </Col>
         <Col style="margin-right: 20px">
-          <span>项目简介：</span><span>{{ detailList.project_title }}</span>
+          <span>项目简称：</span><span>{{ detailList.project_title }}</span>
         </Col>
       </Row>
     </div>
@@ -709,6 +710,7 @@ export default {
           key: "index",
         },
         { title: "序号", align: "center", type: "index" },
+        {title:'图号',align:'center',key:'url_number'},
         { title: "区域", align: "center", key: "region" },
         { title: "产品名称", align: "center", key: "product_title" },
         { title: "数量", align: "center", key: "num" },
@@ -820,6 +822,15 @@ export default {
     this.contractList();
   },
   methods: {
+    handleAutoMatch(){
+        this.axios.post('/api/contract_auto_match_save',{order_no:this.$route.query.order_no}).then(res=>{
+          if(res.code==200){
+            this.$Message.success(res.msg);
+            //跟点击匹配的tab标签一样的事件；
+           this.handleTabsClick(1);
+          }
+        })
+    },
     checkPrice(row) {
       if (row.total_price < 0) {
         row.total_price = "0.00";

src/views/BasicSettings/ClassifyDocs/TypeDocs.vue

@@ -21,7 +21,8 @@
       <div class="content_table">
         <Table :columns="tableColumns"
                border
-               :data="tableData">
+               :data="tableData"
+               max-height='550'>
           <template slot="setSlot"
                     slot-scope="{row,index}">
             <a style="margin:0 5px"
@@ -44,6 +45,14 @@
                v-model="modalData.title"
                style="width: 220px" />
       </div>
+       <div class="modal_content">
+        <span>收发类别编码: </span>
+        <Input type="text"
+               size="small"
+               placeholder="请输入收发类别编码"
+               v-model="modalData.code"
+               style="width: 220px" />
+      </div>
       <div class="modal_content">
         <span>所属分类: </span>
         <Select v-model="modalData.basic_type_id"
@@ -75,6 +84,7 @@ export default {
     // 这里存放数据
     return {
       tableColumns: [
+        {title:'收发类别编码',key:'code',align:'center',minWidth:120},
         { title: '类型档案', key: 'title', align: 'center', minWidth: 120 },
         {
           title: '所属分类', key: 'type_id', align: 'center', minWidth: 120,
@@ -103,6 +113,7 @@ export default {
       modalData: {
         title: '',
         basic_type_id: '',
+        code:''
       },
       id: '',
     }
@@ -132,12 +143,14 @@ export default {
           this.id = ''
           this.modalData.title = ''
           this.modalData.basic_type_id = ''
+          this.modalData.code=''
           this.showModal = true
           break;
         case 2:
           this.id = row.id
           this.modalData.title = row.title
           this.modalData.basic_type_id = row.type_id
+          this.modalData.code=row.code
           this.showModal = true
           break;
         case 3:
@@ -180,7 +193,8 @@ export default {
           data: {
             id: this.id,
             basic_type_id:this.modalData.basic_type_id,
-            title: this.modalData.title
+            title: this.modalData.title,
+            code:this.modalData.code
           }
         }).then((res) => {
           this.$Message.success(res.msg)
@@ -215,5 +229,10 @@ export default {
   display: flex;
   justify-content: space-around;
   padding: 10px 0;
+  span{
+    display: inline-block;
+    width: 100px;
+    text-align: right;
+  }
 }
 </style>

src/views/BasicSettings/SuppliersManage/SippliersList.vue

@@ -114,6 +114,7 @@
               border
               :loading="tableLoading"
               :data="tableData"
+              max-height='400'
             >
               <template slot="setSlot" slot-scope="{ row, index }">
                   <a style="margin: 0 5px" @click="handleSet(4, row, index)"

src/views/BasicSettings/SuppliersManage/SippliersListEdit.vue

@@ -122,6 +122,26 @@
             placeholder="请输入备注"
           />
         </FormItem>
+         <FormItem label="供应商简称:">
+           <span v-if="$route.query.type == 4">{{formData.abbreviation}}</span>
+          <Input
+          v-else
+            v-model="formData.abbreviation"
+            style="width:200px"
+            clearable
+            placeholder="请输入供应商简称"
+          />
+        </FormItem>
+         <FormItem label="供应商助记码:">
+           <span v-if="$route.query.type == 4">{{formData.supply_help}}</span>
+          <Input
+          v-else
+            v-model="formData.supply_help"
+            style="width:200px"
+            clearable
+            placeholder="请输入供应商助记码"
+          />
+        </FormItem>
       </Form>
     </div>
     <Modal v-model="showModal" title="查看">
@@ -168,6 +188,8 @@ export default {
         address: "",
         basics_supply_id: "",
         remark: "",
+        abbreviation:'',
+        supply_help:'',
       },
       ruleValidate: {
         code: [

src/views/BasicSettings/printStyle.vue

@@ -9,12 +9,12 @@
       <Topsearch :list="list" @init="init" @searchData="init"></Topsearch>
       <Table :columns="tableColumns" border :data="tableData">
         <template slot-scope="{ row }" slot="picture">
-            <img
-                  @click="looks(row.img_url)"
-                  :src="$store.state.ip + row.img_url"
-                  alt=""
-                  style="width:40px;height:auto"
-                />
+          <img
+            @click="looks(row.img_url)"
+            :src="$store.state.ip + row.img_url"
+            alt=""
+            style="width: 40px; height: auto"
+          />
         </template>
         <template slot="set" slot-scope="{ row }">
           <a style="margin-right: 10px" @click="forbidden(row)">{{
@@ -37,22 +37,41 @@
     />
     <Modal title="编辑" :width="450" v-model="showEdit" @on-ok="saveData">
       <Form :label-width="120">
-         <FormItem label="打印机品牌：">
-          <Select v-model="modalData.printer_brand" filterable clearable @on-change='changePrintBrand'>
+        <FormItem label="打印机品牌：">
+          <Select
+            v-model="modalData.printer_brand"
+            filterable
+            clearable
+            @on-change="changePrintBrand"
+          >
             <Option value="POSTEK">POSTEK</Option>
             <Option value="灵天智能">灵天智能</Option>
           </Select>
         </FormItem>
-        <FormItem label="打印机名称：" v-if="print_style==0">
-          <Select v-model="modalData.printerUsbPort" filterable clearable :disabled='order_no_disable' > 
-            <Option v-for="(item,index) in Print_order_no_list" :key="index" :label="item.printerName" :value="item.printerUsbPort"></Option>
+        <FormItem label="打印机名称：" v-if="print_style == 0">
+          <Select
+            v-model="modalData.printerUsbPort"
+            filterable
+            clearable
+            :disabled="order_no_disable"
+          >
+            <Option
+              v-for="(item, index) in Print_order_no_list"
+              :key="index"
+              :label="item.printerName"
+              :value="item.printerUsbPort"
+            ></Option>
           </Select>
         </FormItem>
         <FormItem label="打印机端口号：" v-else>
           <!-- <Select v-model="modalData.printerUsbPort" filterable clearable :disabled='order_no_disable' > 
             <Option v-for="(item,index) in Print_order_no_list" :key="index" :label="item.printerName" :value="item.printerUsbPort"></Option>
           </Select> -->
-          <Input v-model="modalData.printerUsbPort" clearable :disabled='order_no_disable'></Input>
+          <Input
+            v-model="modalData.printerUsbPort"
+            clearable
+            :disabled="order_no_disable"
+          ></Input>
         </FormItem>
         <FormItem label="分类：">
           <Select v-model="modalData.type" filterable clearable>
@@ -110,9 +129,9 @@ import $ from "jquery";
 export default {
   data() {
     return {
-      print_style:0,
-      Print_order_no_list:[],
-      order_no_disable:true,
+      print_style: 0,
+      Print_order_no_list: [],
+      order_no_disable: true,
       modalData: {},
       showEdit: false,
       stateData: {},
@@ -181,39 +200,40 @@ export default {
     };
   },
   methods: {
-    changePrintBrand(e){
-         if(e === 'POSTEK'){
-           this.print_style = 0;
-           this.axios.get("/api/get_print_url").then((res) => {
-             let url = `http://${res.data.request_url}:888/postek/print`; //request_url
-             let _this = this;
-              $.ajax({
-          type: "post",
-          url,
-          data: {reqParam:'printerList'},
-          dataType: "json",
-          timeout: 5000,
-          success: function(result) {
+    changePrintBrand(e) {
+      if (e === 'POSTEK') {
+        this.print_style = 0;
+        this.axios.get("/api/get_print_url").then((res) => {
+          let url = `http://${res.data.request_url}:888/postek/print`; //request_url
+          let _this = this;
+          $.ajax({
+            type: "post",
+            url,
+            data: { reqParam: 'printerList' },
+            dataType: "json",
+            timeout: 5000,
+            success: function (result) {
 
-            if (result.retval == "0") {
-              _this.$Message.success("发送成功");
-              _this.order_no_disable = false;
-             _this.Print_order_no_list=result.printerList;
-            } else {
-              _this.$Message.error("发送失败，返回结果：" + result.msg);
-            }
-          },
-          error: function() {
-             _this.$Message.error("未连接此类型打印机");
+              if (result.retval == "0") {
+                _this.$Message.success("发送成功");
+                _this.order_no_disable = false;
+                _this.Print_order_no_list = result.printerList;
+                _this.modalData.printerUsbPort = result.printerList[0].printerUsbPort;
+              } else {
+                _this.$Message.error("发送失败，返回结果：" + result.msg);
+              }
+            },
+            error: function () {
+              _this.$Message.error("未连接此类型打印机");
               _this.order_no_disable = true;
-          },
-        });
-           })
-         }else if(e==='灵天智能'){
-           this.print_style =1;
-         }
+            },
+          });
+        })
+      } else if (e === '灵天智能') {
+        this.print_style = 1;
+      }
     },
-       looks(img) {
+    looks(img) {
       const array = [{ img_url: img }];
       this.$previewImg({
         list: array,
@@ -222,15 +242,15 @@ export default {
         baseTitleField: "",
       });
     },
-     delItems() {
-     this.modalData.img_url = '';
+    delItems() {
+      this.modalData.img_url = '';
     },
-     changeIpt(e, row) {
+    changeIpt(e, row) {
       let file = e.target.files[0];
       this.postImg(file, row);
       e.target.value = null;
     },
-     postImg(file,row) {
+    postImg(file, row) {
       let formData = new FormData();
       formData.append("file", file);
       this.axios.post("/api/upload_pic", formData).then((res) => {
@@ -253,38 +273,38 @@ export default {
       this.modalData = JSON.parse(JSON.stringify(row));
       console.log(this.modalData);
       this.modalData.state = this.modalData.state == 0 ? "禁用" : "启用";
-  if(this.modalData.printer_brand){
-    this.order_no_disable = true;
-     if(this.modalData.printer_brand==='POSTEK'){
-       this.print_style = 0;
-           this.axios.get("/api/get_print_url").then((res) => {
-             let url = `http://${res.data.request_url}:888/postek/print`; //request_url
-             let _this = this;
-              $.ajax({
-          type: "post",
-          url,
-          data: {reqParam:'printerList'},
-          dataType: "json",
-          timeout: 5000,
-          success: function(result) {
+      if (this.modalData.printer_brand) {
+        this.order_no_disable = true;
+        if (this.modalData.printer_brand === 'POSTEK') {
+          this.print_style = 0;
+          this.axios.get("/api/get_print_url").then((res) => {
+            let url = `http://${res.data.request_url}:888/postek/print`; //request_url
+            let _this = this;
+            $.ajax({
+              type: "post",
+              url,
+              data: { reqParam: 'printerList' },
+              dataType: "json",
+              timeout: 5000,
+              success: function (result) {
 
-            if (result.retval == "0") {
-             _this.Print_order_no_list=result.printerList;
-             _this.order_no_disable = false;
-            } else {
-              _this.$Message.error("发送失败，返回结果：" + result.msg);
-            }
-          },
-          error: function() {
-             _this.$Message.error('未连接打印机,不能获取端口号')
-          },
-        });
-           })
-         }else if(this.modalData.printer_brand==='灵天智能'){
-           this.order_no_disable = false;
-             this.print_style = 1;
-         }
-  }
+                if (result.retval == "0") {
+                  _this.Print_order_no_list = result.printerList;
+                  _this.order_no_disable = false;
+                } else {
+                  _this.$Message.error("发送失败，返回结果：" + result.msg);
+                }
+              },
+              error: function () {
+                _this.$Message.error('未连接打印机,不能获取端口号')
+              },
+            });
+          })
+        } else if (this.modalData.printer_brand === '灵天智能') {
+          this.order_no_disable = false;
+          this.print_style = 1;
+        }
+      }
       this.showEdit = true;
     },
     forbidden(row) {
@@ -295,8 +315,8 @@ export default {
           type: row.type,
           title: row.title,
           img_url: row.img_url,
-          printer_brand:row.printer_brand,
-          printerUsbPort:row.printerUsbPort
+          printer_brand: row.printer_brand,
+          printerUsbPort: row.printerUsbPort
         })
         .then((res) => {
           if (res.code == 200) {
@@ -384,10 +404,9 @@ export default {
     }
   }
   .delete-img {
-  position: absolute;
-  right: 5px;
-  top: 5px;
- 
-}
+    position: absolute;
+    right: 5px;
+    top: 5px;
+  }
 }
 </style>

src/views/BidSystem/DeepeningOrder/newEdit.vue

@@ -57,7 +57,7 @@
             <a style="margin-right:10px" @click='handleGoPage(row,0)'>详情</a>
              <!-- <a style="margin-right:10px" @click='handleGoPage(row,1)' v-show="type==2">编辑</a> -->
             <a @click="handleDel(row)" v-show="type!=3&&tableData.every(v=>(v.state==0))">删除</a>
-            <a v-show="type==3" @click="handleOrder(row,1)">下拆单</a>
+            <a v-show="type==3&&row.state==0" @click="handleOrder(row,1)">下拆单</a>
         </template>
      </Table>
      <div class="footerPage">

src/views/BidSystem/OutputValue/otherList.vue

@@ -1,26 +1,45 @@
 <template>
-  <div style="width:100%">
+  <div style="width: 100%">
     <Toptitle title="产值表">
-      <Button type="primary" ghost style="margin-right: 10px" @click='exportData()'>导出</Button>
-    </Toptitle>
-    <div style="height:90%;overflow:auto">
-    <Topsearch :list="list"  @searchData="searchVal"> </Topsearch>
-    <div class="table_content" >
-        <div  v-for="(item, index) in tableData" :key="index" class="table_style" >
-        <div class="table_title">{{item.title}}</div>
-      <Table
-        :data="item.data"
-        :columns="tableColumns"
-        border
-        max-height='614'
-          show-summary 
-    :summary-method="handleSummary"
+      <Button
+        type="primary"
+        ghost
+        style="margin-right: 10px"
+        @click="exportData()"
+        >导出</Button
       >
-      </Table>
+    </Toptitle>
+    <div style="height: 90%; overflow: auto">
+      <!-- <Form style="display:flex;flex-wrap:wrap;margin-top:10px">
+      <FormItem label='班组:'>
+        <Select filterable></Select>
+      </FormItem>
+      <FormItem label='日期:'></FormItem>
+      <FormItem label='项目名称:'></FormItem>
+      <FormItem label='图号:'></FormItem> 
+      <FormItem :label-width='40'></FormItem>
+    </Form> -->
+      <Topsearch :list="list" @searchData="searchVal"> </Topsearch>
+      <div class="table_content">
+        <div
+          v-for="(item, index) in tableData"
+          :key="index"
+          class="table_style"
+        >
+          <div class="table_title">{{ item.title }}</div>
+          <Table
+            :data="item.data"
+            :columns="tableColumns"
+            border
+            max-height="614"
+            show-summary
+            :summary-method="handleSummary"
+          >
+          </Table>
+        </div>
       </div>
     </div>
-    </div>
-     <!-- <div class="pageSlotStyle">
+    <!-- <div class="pageSlotStyle">
           <Page
             :page-size-opts="[10, 20, 30, 50, 100, 1000]"
             @on-page-size-change="changeSize"
@@ -38,25 +57,25 @@
 export default {
   data() {
     return {
-      searchState:false,
-        proxyData:{},
-        total:0,
-        pageSize:10,
-        pageIndex:1,
+      searchState: false,
+      proxyData: {},
+      total: 0,
+      pageSize: 10,
+      pageIndex: 1,
       tableData: [],
-      tableColumns:[   
-      {title:'日期',align:'center',width:'120',key:'end_time'},
-      {title:'项目名称',align:'center',width:'100',key:'residential_name',ellipsis:true,tooltip:true},
-      {title:'图号',align:'center',width:'80',key:'url_number',ellipsis:true,tooltip:true},
-      {title:'平方',align:'center',width:'100',key:'area',ellipsis:true,tooltip:true},
-      {title:'人数',align:'center',width:'80',key:'count'},
-     ],
+      tableColumns: [
+        { title: '日期', align: 'center', width: '120', key: 'end_time' },
+        { title: '项目名称', align: 'center', width: '100', key: 'residential_name', ellipsis: true, tooltip: true },
+        { title: '图号', align: 'center', width: '80', key: 'url_number', ellipsis: true, tooltip: true },
+        { title: '平方', align: 'center', width: '100', key: 'area', ellipsis: true, tooltip: true },
+        { title: '人数', align: 'center', width: '80', key: 'count' },
+      ],
       list: [
         {
           title: "班组",
           name: "Select",
-          isTooltip:true,
-          showChooseAll:true,
+          isTooltip: true,
+          showChooseAll: true,
           value: "",
           multiple: true,
           filterable: true,
@@ -67,22 +86,22 @@ export default {
           option: [],
         },
         {
-            title:'日期',
-            isDate:true,
-            name:"Date",
-            type:'date',
-            start_value:`${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-1`,
-            end_value:['1','3','5','7','8','10','12'].indexOf((new Date()).toLocaleDateString().split('/')[1])>=0?`${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-31`:['4','6','9','11'].indexOf((new Date()).toLocaleDateString().split('/')[1])>=0?`${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-30`:`${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-${((new Date()).toLocaleDateString().split('/')[0])%4==0?29:28}`,
-            start_server: "start_time",
-            end_server:'end_time',
-            start_placeholder:'年/月',
-            end_placeholder:'年/月'
+          title: '日期',
+          isDate: true,
+          name: "Date",
+          type: 'date',
+          start_value: `${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-1`,
+          end_value: ['1', '3', '5', '7', '8', '10', '12'].indexOf((new Date()).toLocaleDateString().split('/')[1]) >= 0 ? `${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-31` : ['4', '6', '9', '11'].indexOf((new Date()).toLocaleDateString().split('/')[1]) >= 0 ? `${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-30` : `${(new Date()).toLocaleDateString().split('/')[0]}-${(new Date()).toLocaleDateString().split('/')[1]}-${((new Date()).toLocaleDateString().split('/')[0]) % 4 == 0 ? 29 : 28}`,
+          start_server: "start_time",
+          end_server: 'end_time',
+          start_placeholder: '年/月/日',
+          end_placeholder: '年/月/日'
         },
         {
           title: "项目名称",
           name: "Select",
-          isTooltip:true,
-          showChooseAll:true,
+          isTooltip: true,
+          showChooseAll: true,
           value: "",
           multiple: true,
           filterable: true,
@@ -92,11 +111,11 @@ export default {
           optionValue: "value",
           option: [],
         },
-         {
+        {
           title: "图号",
           name: "Select",
-          isTooltip:true,
-          showChooseAll:true,
+          isTooltip: true,
+          showChooseAll: true,
           value: "",
           multiple: true,
           filterable: true,
@@ -118,88 +137,89 @@ export default {
   //       }
   // },
   mounted() {
-    this.axios.post('/api/team_list').then(res=>{
-       this.proxyData.employee = res.data.data;
+    this.axios.post('/api/team_list').then(res => {
+      this.proxyData.employee = res.data.data;
       let employee = [];
-         res.data.data.forEach(v=>{
-           let obj ={};
-           obj.label = v;
-           obj.value=v;
-           employee.push(obj);
-         })
-         this.list[0].option = employee;
-          let residential_name = [];
-          res.data.residential_name.forEach(v=>{
-               let obj = {};
-               obj.label = v;
-               obj.value = v;
-               residential_name.push(obj)
-          })
-          this.list[2].option = residential_name;
-          let url_number = [];
-          res.data.url_number.forEach(v=>{
-                let obj = {};
-               obj.label = v;
-               obj.value = v;
-               url_number.push(obj)
-          })
-          this.list[3].option = url_number;
+      res.data.data.forEach(v => {
+        let obj = {};
+        obj.label = v;
+        obj.value = v;
+        employee.push(obj);
+      })
+      this.list[0].option = employee;
+      let residential_name = [];
+      res.data.residential_name.forEach(v => {
+        let obj = {};
+        obj.label = v;
+        obj.value = v;
+        residential_name.push(obj)
+      })
+      this.list[2].option = residential_name;
+      let url_number = [];
+      res.data.url_number.forEach(v => {
+        let obj = {};
+        obj.label = v;
+        obj.value = v;
+        url_number.push(obj)
+      })
+      this.list[3].option = url_number;
     })
   },
   methods: {
-     handleSummary ({ columns, data }) {
-                const sums = {};
-                columns.forEach((column, index) => {
-                    const key = column.key;
-                    if (index === 0) {
-                        sums[key] = {
-                            key,
-                            value: '合计'
-                        };
-                        return;
-                    }
-                    const values = data.map(item => Number(item[key]));
-                    if (key === 'area') {
-                        const v = values.reduce((prev, curr) => {
-                            const value = Number(curr);
-                            if (!isNaN(value)) {
-                                return prev + curr;
-                            } else {
-                                return prev;
-                            }
-                        }, 0);
-                        sums[key] = {
-                            key,
-                            value:v.toFixed(2)
-                        };
-                    } else {
-                        sums[key] = {
-                            key,
-                            value: ''
-                        };
-                    }
-                });
+    handleSummary({ columns, data }) {
+      const sums = {};
+      columns.forEach((column, index) => {
+        const key = column.key;
+        if (index === 0) {
+          sums[key] = {
+            key,
+            value: '合计'
+          };
+          return;
+        }
+        const values = data.map(item => Number(item[key]));
+        if (key === 'area') {
+          const v = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[key] = {
+            key,
+            value: v.toFixed(2)
+          };
+        } else {
+          sums[key] = {
+            key,
+            value: ''
+          };
+        }
+      });
 
-                return sums;
-        },
-     searchVal(row){
-         if(this.searchState){
-           return
-         }else{
-           this.searchState = true;
-           this.search(row);
-           
-         }
-     },
-      // changeSize(e){
-      //   console.log(1)
-      //      this.pageSize = e;
-      //      this.search(this.proxyData);
-      // },
-      // changePage(e){
-      //     this.pageIndex = e;
-      //     this.search(this.proxyData);
-      // },
+      return sums;
+    },
+    searchVal(row) {
+
+      if (this.searchState) {
+        return
+      } else {
+        this.searchState = true;
+        this.search(row);
+
+      }
+    },
+    // changeSize(e){
+    //   console.log(1)
+    //      this.pageSize = e;
+    //      this.search(this.proxyData);
+    // },
+    // changePage(e){
+    //     this.pageIndex = e;
+    //     this.search(this.proxyData);
+    // },
     // init(row) {
     //       if(row){
     //           this.proxyData = JSON.parse(JSON.stringify(row))
@@ -227,52 +247,53 @@ export default {
     //     })
     //   });
     // },
-    async exportData(){
-            const res = await this.axios.post('/api/output_value_export',{...this.proxyData})
-           if(res.code == 200){
-                let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
-                location.href = url
-            }
-        },
-   async search(row){
-      
-         if(row){
-             console.log(row)
-              row.start_time=row.start_time.indexOf('-')>=0?Date.parse(row.start_time).toString().slice(0,10):row.start_time;
-              row.end_time = row.end_time.indexOf('-')>=0?Date.parse(row.end_time).toString().slice(0,10):row.end_time;
-               this.proxyData = JSON.parse(JSON.stringify(row))
-               if(this.proxyData.employee.length==0){
-               this.proxyData.employee = [];
-               row.employee =[];
-               this.list[0].option.forEach(v=>{
-                 this.proxyData.employee.push(v.value);
-                 row.employee.push(v.value);
-               })}
-          }
-         this.tableData = [];
-        // this.total = 0;
-       
-      row.employee.forEach(async (v)=>{
-           await this.axios.post("/api/outputs_value_list",{start_time:row.start_time,end_time:row.end_time,employee:v,url_number:row.url_number,residential_name:row.residential_name}).then(res=>{
-            //  if(res.data.total>this.total){
-            //    this.total = res.data.total;
-            //  }
-             this.$nextTick(()=>{
-                if(res.data.data.length<12){
-                for(let i=0;i<12;i++){
-                    if(res.data.data.length<12){
-                        res.data.data.push({});
-                    }else{
-                        break;
-                    }
+    async exportData() {
+      const res = await this.axios.post('/api/output_value_export', { ...this.proxyData })
+      if (res.code == 200) {
+        let url = `${this.$store.state.ip}/api/storage/${res.data.file}`
+        location.href = url
+      }
+    },
+    async search(row) {
+
+      if (row) {
+        console.log(row)
+        row.start_time = row.start_time.indexOf('/') >= 0 ? Date.parse(row.start_time).toString().slice(0, 10) : Date.parse(`${(new Date()).toLocaleDateString().split('/')[0]}/${(new Date()).toLocaleDateString().split('/')[1]}/1`).toString().slice(0, 10);
+        row.end_time = row.end_time.indexOf('/') >= 0 ? Date.parse(row.end_time).toString().slice(0, 10) : Date.parse(['1', '3', '5', '7', '8', '10', '12'].indexOf((new Date()).toLocaleDateString().split('/')[1]) >= 0 ? `${(new Date()).toLocaleDateString().split('/')[0]}/${(new Date()).toLocaleDateString().split('/')[1]}/31` : ['4', '6', '9', '11'].indexOf((new Date()).toLocaleDateString().split('/')[1]) >= 0 ? `${(new Date()).toLocaleDateString().split('/')[0]}/${(new Date()).toLocaleDateString().split('/')[1]}/30` : `${(new Date()).toLocaleDateString().split('/')[0]}/${(new Date()).toLocaleDateString().split('/')[1]}/${((new Date()).toLocaleDateString().split('/')[0]) % 4 == 0 ? 29 : 28}`).toString().slice(0, 10);
+        this.proxyData = JSON.parse(JSON.stringify(row))
+        if (this.proxyData.employee.length == 0) {
+          this.proxyData.employee = [];
+          row.employee = [];
+          this.list[0].option.forEach(v => {
+            this.proxyData.employee.push(v.value);
+            row.employee.push(v.value);
+          })
+        }
+      }
+      this.tableData = [];
+      // this.total = 0;
+
+      row.employee.forEach(async (v) => {
+        await this.axios.post("/api/outputs_value_list", { start_time: row.start_time, end_time: row.end_time, employee: v, url_number: row.url_number, residential_name: row.residential_name }).then(res => {
+          //  if(res.data.total>this.total){
+          //    this.total = res.data.total;
+          //  }
+          this.$nextTick(() => {
+            if (res.data.data.length < 12) {
+              for (let i = 0; i < 12; i++) {
+                if (res.data.data.length < 12) {
+                  res.data.data.push({});
+                } else {
+                  break;
                 }
+              }
             }
-             })
-           
-               this.tableData.push(res.data);
-               this.searchState = false;
-            // this.tableData.sort(this.sort);
-            })
+          })
+
+          this.tableData.push(res.data);
+          this.searchState = false;
+          // this.tableData.sort(this.sort);
+        })
       })
       // this.tableData.forEach(v=>{
       //    if(v.length<this.total){
@@ -285,39 +306,37 @@ export default {
       //           }
       //       }
       // })
-    // this.$forceUpdate();
-      
+      // this.$forceUpdate();
+
+    },
+    sort(a, b) {
+
+      return a.index - b.index
     },
-      sort(a,b){
-        
-       return a.index-b.index
-      },
   },
 };
 </script>
 <style lang="scss" scoped>
-.table_content{
-    vertical-align: top;
-    overflow-y: hidden;
-    overflow-x: auto;
-    white-space: nowrap;
-    height: 710px;
-    width:100%;
-    .table_title{
-        text-align: center;
-        font-size: 18px;
-        font-weight: bold;
-        border-top:#dcdee2 solid 2px;
-        border-left:#dcdee2 solid 2px; 
-        border-right: #dcdee2 solid 2px;;
-    }
-    .table_style{
-        display: inline-block;
-        width:492px;
-        
-    }
-  
-}  
+.table_content {
+  vertical-align: top;
+  overflow-y: hidden;
+  overflow-x: auto;
+  white-space: nowrap;
+  height: 710px;
+  width: 100%;
+  .table_title {
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    border-top: #dcdee2 solid 2px;
+    border-left: #dcdee2 solid 2px;
+    border-right: #dcdee2 solid 2px;
+  }
+  .table_style {
+    display: inline-block;
+    width: 492px;
+  }
+}
 .pageSlotStyle {
   text-align: center;
   margin-top: 10px;

src/views/BidSystem/ProductDeOrder/newEdit.vue

@@ -2,6 +2,20 @@
     <div>
         <Toptitle :title="type==1?'新增':type==2?'编辑':'详情'">
             <Button @click="$router.go(-1)" style="margin-right:10px">取消</Button>
+            <Button @click="handleTakeApart" style="margin-right:10px" type='primary' v-show="type==2">批量拆单</Button>
+            <Upload
+        ref="upload"
+          name="your_file"
+          :show-upload-list="false"
+          :headers="headers"
+          :on-error="uploadError"
+          :on-success="uploadSuccess"
+          :action="$store.state.ip + '/api/split_import_news'"
+          :data='{list:JSON.stringify(selectData)}'
+         v-show="false"
+        >
+        </Upload>
+        <Button @click="handleExport" type="primary" v-if="type==3" style="margin-right:10px">批量下生产</Button>
             <Button type="primary" @click="handleSubmit('formValidate')" v-if="type!=3">保存</Button>
         </Toptitle>
         <Form ref="formValidate" :model="formData" :rules="ruleValidate" class="form_content" :label-width='120'>
@@ -50,6 +64,31 @@
         </Form>
         <Card style="max-height:67%;overflow:auto">
             <Form :label-width='110' class="form_content">
+                 <FormItem label='区域：'>
+                    <Select filterable clearable class="form_item" v-model="searchData.area">
+                        <Option v-for="(item,index) in TableAreaList" :key="index" :value="item" :label="item"/>
+                    </Select>
+                </FormItem>
+                         <FormItem label='楼栋：'>
+                    <Select filterable clearable class="form_item" v-model="searchData.house">
+                        <Option v-for="(item,index) in TableHouseList" :key="index" :value="item" :label="item"/>
+                    </Select>
+                </FormItem>
+                         <FormItem label='单元：'>
+                    <Select filterable clearable class="form_item" v-model="searchData.unit">
+                        <Option v-for="(item,index) in TableUnitList" :key="index" :value="item" :label="item"/>
+                    </Select>
+                </FormItem>
+                         <FormItem label='楼层：'>
+                    <Select filterable clearable class="form_item" v-model="searchData.layer">
+                        <Option v-for="(item,index) in TableLayerList" :key="index" :value="item" :label="item"/>
+                    </Select>
+                </FormItem>
+                         <FormItem label='房号：'>
+                    <Select filterable clearable class="form_item" v-model="searchData.number">
+                        <Option v-for="(item,index) in TableNumberList" :key="index" :value="item" :label="item"/>
+                    </Select>
+                </FormItem>
                 <FormItem label='产品分类：'>
                     <Select filterable clearable class="form_item" v-model="searchData.product_type">
                         <Option v-for="(item,index) in productTypeList" :key="index" :value="item" :label="item"/>
@@ -121,11 +160,21 @@
           :data="tableData"
           :column-config="{resizable: true}"
           :edit-config="{trigger: 'click', mode: 'row'}"
+          @checkbox-change='handleSelectTable'
+          @checkbox-all='handleSelectAll'
           >
-          <vxe-column field="index" width="60" title="序号"></vxe-column>
+          <vxe-column type="checkbox" width="80" title="选择"></vxe-column>
+           <vxe-column field="order_number" width="120" title="订单编号"></vxe-column>
+           <vxe-column field="area" width="60" title="区域"></vxe-column>
+          <vxe-column field="house" width="60" title="楼栋"></vxe-column>
+          <vxe-column field="unit" width="60" title="单元"></vxe-column>
+          <vxe-column field="layer" width="60" title="楼层"></vxe-column>
+          <vxe-column field="number" width="60" title="房号"></vxe-column>
             <vxe-column field="product_type" title="产品分类" :edit-render="{enabled:type==3?false:true}" min-width="100">
               <template #edit="{ row }">
-                <vxe-select v-model="row.product_type" type="text" :filterable='true' clearable></vxe-select>
+                <vxe-select v-model="row.product_type" type="text" :filterable='true' clearable transfer>
+                    <vxe-option v-for="(item,index) in productTypeList" :key="index" :value="item" :label="item"></vxe-option>
+                </vxe-select>
               </template>
             </vxe-column>
             <vxe-column field="title" title="产品名称" :edit-render="{enabled:type==3?false:true}" min-width="100">
@@ -208,7 +257,7 @@
           </vxe-column>
            <vxe-column title="操作" min-width="150">
             <template #default="{ row }">
-                 <a style="margin-right:10px" @click="handleSet(row,1)" v-show="type==2&&row.status==0&&row.split_state==1">拆单</a>
+                 <!-- <a style="margin-right:10px" @click="handleSet(row,1)" v-show="type==2&&row.status==0&&row.split_state==1">拆单</a> -->
                     <!-- <a style="margin-right:10px" @click="handleSet(row,2)" v-show="type!=3">复制</a> -->
                     <a style="margin-right:10px" @click="handleSet(row,3)">详情</a>
                     <!-- <a @click="handleSet(row,4,$rowIndex)" v-show="type!=3">删除</a> -->
@@ -305,6 +354,12 @@
 export default {
     data(){
         return{
+            selectData:[],
+            TableHouseList:[],
+            TableUnitList:[],
+            TableLayerList:[],
+            TableAreaList:[],
+            TableNumberList:[],
             codeList:[],
             titleList:[],
             houseList:[],
@@ -338,7 +393,7 @@ export default {
             numPageSize:10,
             numTotal:0,
             show_num:false,
-            exportProduct:{},
+            exportProduct:[],
             modalProductData:{
                 time:[],
                 process_man:'',
@@ -349,6 +404,11 @@ export default {
             urlNumberList:[],
             productTitleList:[],
             searchData:{
+                layer:'',
+                unit:'',
+                number:'',
+                area:'',
+                house:'',
                 product_type:'',
                 url_number:'',
                 title:'',
@@ -398,7 +458,7 @@ export default {
                 {required:true,message:'客户名称不能为空',trigger:'change',type:'number'}
             ],
              warning_state: [
-                        { required: true, message: '紧急程度不能为空', trigger: 'change',type:'number'}
+                        { required: true, message: '紧急程度不能为空', trigger:'blur',type:'number'}
                     ],
            }
         }
@@ -422,6 +482,86 @@ export default {
            this.initData();
     },
     methods:{
+        handleExport(){
+           if(this.selectData.length==0){
+            return this.$Message.warning('请选择要下生产的数据！');
+           }
+           if(!this.selectData.every(v=>(v.explode_status==1&&v.status==0))){
+            return this.$Message.warning('数据中有不能下生产的数据！');
+           }
+           this.show_product = true;
+           let data = [];
+           this.selectData.forEach(v=>{
+            data.push({
+                url_number:[v.url_number],
+                          cut_order_product_ids:v.cut_order_product_ids,
+                          measure:[v.measure],
+                          house_id:[v.house_id],
+                          order_no:v.order_no
+            })
+           })
+                    this.exportProduct=data;
+        },
+           uploadSuccess(res) {
+      if (res.code == 200) {
+          this.$Message.success(res.msg);
+          this.initData(this.proxyData);
+      } else {
+        this.$Message.warning(res.msg || "上传失败");
+      }
+    },
+          uploadError(err) {
+      this.$Message.error(err.msg || "上传失败");
+    },
+        handleSelectAll(e){
+            let data = [];
+             e.records.forEach(v=>{
+                 data.push({
+                    id:v.id,
+                    order_no:v.order_no,
+                    product_name:v.title,
+                    url_number:v.url_number,
+                    cut_order_product_ids:v.cut_order_product_id,
+                          measure:v.measure,
+                          house_id:v.house_id,
+                          explode_status:v.explode_status,
+                          status:v.status,
+                 })
+             })
+           this.selectData = data;
+        },
+        // { checked, row, rowIndex, $rowIndex, column, columnIndex, $columnIndex, $event }
+        handleSelectTable(e){
+             console.log(e.records);
+             let data = [];
+             e.records.forEach(v=>{
+                 data.push({
+                    id:v.id,
+                    order_no:v.order_no,
+                    product_name:v.title,
+                    url_number:v.url_number,
+                    cut_order_product_ids:v.cut_order_product_id,
+                          measure:v.measure,
+                          house_id:v.house_id,
+                           explode_status:v.explode_status,
+                          status:v.status,
+                 })
+             })
+             this.selectData = data;
+             
+        },
+        handleTakeApart(){
+              if(this.selectData.length==0){
+                return this.$Message.warning('请选择需要拆单的数据！');
+              }
+              if(!this.selectData.every(v=>(v.url_number==this.selectData[0].url_number))){
+                return this.$Message.warning('批量拆单只能选择一个图号！')
+              }
+              if(!this.selectData.every(v=>(v.status==0))){
+                return this.$Message.warning('选择的数据中有不能拆单的数据！')
+              }
+              document.getElementsByClassName('ivu-upload-input')[0].click();
+        },
         handleNumSearch(){
               let obj = JSON.parse(JSON.stringify(this.modalNumData));
               this.numProxyData = obj;
@@ -464,7 +604,11 @@ export default {
              }
              let process_start_time = Date.parse(this.modalProductData.time[0]).toString().slice(0,10);
              let process_end_time = Date.parse(this.modalProductData.time[1]).toString().slice(0,10); 
-             this.axios.post('/api/split_pull_product',{order_no:this.$route.query.order_no,...this.exportProduct,process_man:this.modalProductData.process_man,process_start_time,process_end_time}).then(res=>{
+             let data = [];
+             this.exportProduct.forEach(ele => {
+                 data.push({...ele,process_man:this.modalProductData.process_man,process_start_time,process_end_time})
+             });
+             this.axios.post('/api/split_pull_product',{list:data}).then(res=>{
                 if(res.code==200){
                     this.$Message.success(res.msg);
                     this.show_product=false;
@@ -493,6 +637,11 @@ export default {
             this.productTypeList = res.data.product_type;
             this.productTitleList = res.data.product_title;
             this.urlNumberList = res.data.url_number;
+            this.TableHouseList = res.data.house;
+            this.TableUnitList= res.data.unit;
+            this.TableAreaList = res.data.area;
+            this.TableNumberList = res.data.number;
+            this.TableLayerList = res.data.layer;
             this.tableData.forEach((v,index)=>{
                 v.index = index+1
             })
@@ -506,19 +655,19 @@ export default {
            this.formData.predict_time = this.func.replaceDateNoHMS(this.formData.predict_time);
    })
         },
-          uploadSuccess(res) {
-      if (res.code == 200) {
-           this.axios.post('/api/deep_detail',{order_no:this.recordOrderNO?this.recordOrderNO:this.formData.order_no}).then(res=>{
-                 this.tableData = res.data.data;
-                 this.total = res.data.total;
-           })
-      } else {
-        this.$Message.warning(res.msg || "上传失败");
-      }
-    },
-          uploadError(err) {
-      this.$Message.error(err.msg || "上传失败");
-    },
+    //       uploadSuccess(res) {
+    //   if (res.code == 200) {
+    //        this.axios.post('/api/deep_detail',{order_no:this.recordOrderNO?this.recordOrderNO:this.formData.order_no}).then(res=>{
+    //              this.tableData = res.data.data;
+    //              this.total = res.data.total;
+    //        })
+    //   } else {
+    //     this.$Message.warning(res.msg || "上传失败");
+    //   }
+    // },
+    //       uploadError(err) {
+    //   this.$Message.error(err.msg || "上传失败");
+    // },
 
         changeSize(e){
          this.pageSize = e;
@@ -563,11 +712,13 @@ export default {
                     break;
                 case 5:
                     this.show_product = true;
-                    this.exportProduct={
+                    this.exportProduct=[{
                         url_number:[row.url_number],
                           cut_order_product_ids:row.cut_order_product_id,
-                          measure:[row.measure]
-                    }
+                          measure:[row.measure],
+                          house_id:[row.house_id],
+                          order_no:row.order_no
+                    }]
                     break;
                 case 6:
                    let data = {};

src/views/BidSystem/ProductDeOrder/newSplitOrder.vue

@@ -9,7 +9,7 @@
           :on-error="uploadError"
           :on-success="uploadSuccess"
           :action="$store.state.ip + '/api/split_import_news'"
-          :data='{order_no:$route.query.order_no,url_number:$route.query.url_number,num:$route.query.num,product_name:$route.query.title,measure:$route.query.measure}'
+          :data='{order_no:$route.query.order_no,url_number:$route.query.url_number,num:$route.query.num,product_name:$route.query.title,measure:$route.query.measure,id:$route.query.id}'
           v-if='$route.query.type==1'
         >
           <Button type="primary">导入</Button
@@ -256,7 +256,7 @@ KeyBoard
     },
 
       initData(){
-      this.axios.get('/api/split_details',{params:{order_no:this.$route.query.order_no,url_number:this.$route.query.url_number,measure:this.$route.query.measure}}).then(res=>{
+      this.axios.get('/api/split_details',{params:{...this.$route.query}}).then(res=>{
         this.tableData = res.data;
       })
       },

src/views/ChipPrintScreen/list.vue

@@ -27,7 +27,8 @@ export default {
     position:fixed;
     left: 53%;
     top: 50%;
-    transform:translate(-50%,-50%);
+    transform:translate(-60%,-50%);
+    width: 740px;
     .block_item{
         border-radius: 10px;
          margin: 60px;

src/views/MaterialMannage/index.vue

@@ -35,7 +35,9 @@
         <Button @click="goDetial(1)"
                 type="primary"
                 ghost
-                icon='md-add'>新增物料</Button>
+                icon='md-add'
+                style="margin-right:10px">新增物料</Button>
+                <Button type="primary" @click="handleOnceTogether">一键同步</Button>
       </div>
       <div slot='navButton'>
       </div>
@@ -184,6 +186,13 @@ export default {
      }
   },
   methods: {
+    handleOnceTogether(){
+         this.axios.get('/api/change_data').then(res=>{
+          if(res.code==200){
+            this.$Message.success(res.msg);
+          }
+         })
+    },
     init (row) {
       this.pageIndex = 1
       row.type_id = this.$route.query.id;

src/views/MaterialMannage/yongyouIndex.vue

@@ -0,0 +1,370 @@
+<template>
+  <div class="SippliersList">
+    <Toptitle title="用友物料列表">
+          <Button type="primary" @click="handleOnceTogether">一键同步</Button>
+    </Toptitle>
+    <div class="content">
+      <div class="content_left">
+      <!-- <div :class="item.is_select?'is_select':''" v-for="(item,index) in materialList" :key="index" @click="handleSelect(item,index)">{{item.title}}</div> -->
+       <Tree :data="treeData" @on-select-change='handleSelect'></Tree>
+      </div>
+      <div class="content_right">
+        <div class="content_right_topform">
+          <Form :label-width="90" :model="searchData">
+             <FormItem label="存货编码:">
+              <Input
+                type="text"
+                size="small"
+                clearable
+                v-model="searchData.code"
+                style="width: 150px"
+                placeholder="存货编码"
+              />
+            </FormItem>
+            <FormItem label="存货名称:">
+              <Input
+                type="text"
+                size="small"
+                v-model="searchData.title"
+                clearable
+                style="width: 150px"
+                placeholder="存货名称"
+              />
+            </FormItem>
+            <FormItem label="存货简称:">
+              <Input
+                type="text"
+                size="small"
+                clearable
+                v-model="searchData.abbreviation_title"
+                style="width: 150px"
+                placeholder="存货简称"
+              />
+            </FormItem>
+            
+            <FormItem label="物料分类:">
+              <Select
+                v-model="searchData.type_id"
+                size="small"
+                clearable
+                filterable
+                label-in-value
+                style="width: 150px"
+              >
+                <Option
+                  v-for="item in materialList"
+                  :key="item.id"
+                  :label="item.title"
+                  :value="item.id"
+                >
+                </Option>
+              </Select>
+            </FormItem>
+            <FormItem label="品牌:">
+              <Select
+                v-model="searchData.brand_id"
+                size="small"
+                clearable
+                style="width: 150px"
+              >
+               <Option v-for="item in brandList" :key="item.id" :label='item.title' :value="item.id"/>
+              </Select>
+            </FormItem>
+             <FormItem label="高:">
+              <Input
+                type="text"
+                size="small"
+                clearable
+                v-model="searchData.long"
+                style="width: 150px"
+                placeholder="高"
+              />
+            </FormItem>
+             <FormItem label="宽:">
+              <Input
+                type="text"
+                size="small"
+                clearable
+                v-model="searchData.width"
+                style="width: 150px"
+                placeholder="宽"
+              />
+            </FormItem>
+             <FormItem label="厚:">
+              <Input
+                type="text"
+                size="small"
+                clearable
+                v-model="searchData.high"
+                style="width: 150px"
+                placeholder="厚"
+              />
+            </FormItem>
+            <FormItem :label-width='30'>
+              <Button
+                type="primary"
+                size="small"
+                @click="handleSearch"
+                style="margin-right: 10px"
+                >搜索</Button
+              >
+            </FormItem>
+          </Form>
+          <div class="content_right_topfrom_btn"></div>
+        </div>
+        <div class="content_right_content">
+          <div class="content_right_content_table">
+            <Table
+              :columns="tableColumns"
+              border
+              :loading="tableLoading"
+              :data="tableData"
+              max-height='450'
+            >
+            <template slot="image" slot-scope="{row}">
+                <img :src="$store.state.ip+row.img_url" v-show="row.img_url">
+            </template>
+            </Table>
+            <div class="content_right_content_page">
+              <Page
+                :page-size-opts="[10, 20, 30, 40, 100,1000]"
+                @on-page-size-change="changeSize"
+                @on-change="changePage"
+                :current="pageIndex"
+                show-total
+                show-elevator
+                :total="total"
+                show-sizer
+                :page-size="pageSize"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+// 例如：import 《组件名称》 from '《组件路径》';
+
+export default {
+  name: "SippliersList",
+  components: {},
+  props: {},
+  // import引入的组件需要注入到对象中才能使用
+  data() {
+    // 这里存放数据
+    return {
+        treeData:[],
+        selectID:null,
+        proxyData:{},
+        materialList:[],
+      brandList:[],
+      tableColumns: [
+        { title: "存货分类", key: "type_title", align: "center", resizable: true,width: 130,fixed:'left' },
+         { title: "存货编码", key: "code", align: "center", resizable: true,width: 130,fixed:'left' },
+          { title: "存货名称", key: "title", align: "center",resizable: true,width: 200,fixed:'left' },
+           { title: "存货简称", key: "abbreviation_title", align: "center",resizable: true,width: 130 },
+          { title: "存货代码", key: "codes", align: "center",resizable: true,width: 130 }, { title: "存货助记码", key: "material_help_code", align: "center", resizable: true,minWidth: 200 },
+          { title: "品牌", key: "brand_title", align: "center", resizable: true,width: 200 },
+        { title: "规格型号", key: "measure", align: "center", resizable: true,width: 100,render:(h,params)=>{
+            const {row}=params;
+            return h('span',{},`${row.long}*${row.width}*${row.high}`)
+        } }, { title: "计量单位", key: "unit", align: "center", resizable: true,width: 200 },
+         { title: "高", key: "long", align: "center",resizable: true,width: 130 },
+          { title: "宽", key: "width", align: "center",resizable: true,width: 130 },
+           { title: "厚", key: "high", align: "center",resizable: true,width: 130},
+        { title: "主要供应商名称", key: "supply_title", align: "center", resizable: true,width: 200 },
+        
+       
+         
+           
+             { title: "默认税率", key: "fax", align: "center", resizable: true,width: 200 },
+              { title: "参考成本", key: "reference_cost", align: "center", resizable: true,width: 200 },
+               { title: "最新成本", key: "prime_cost", align: "center", resizable: true,width: 200 },
+                { title: "启用日期", key: "start_time", align: "center", resizable: true,width: 200 },
+                 { title: "停用日期", key: "end_time", align: "center", resizable: true,minWidth: 200 },
+ { title: "最高库存", key: "top_number", align: "center",resizable: true,width: 130},
+  { title: "安全库存", key: "warning_number", align: "center",resizable: true,width: 130 },
+  { title: "附件", key: "", align: "center", resizable: true,width: 200,slot:'image'},
+      ],
+      tableData: [],
+      tableLoading: false,
+      pageIndex: 1,
+      pageSize: 10,
+      total: 0,
+      searchData: {
+          code:'',
+          title:'',
+          abbreviation_title:'',
+            type_id:'',
+            brand_id:'',
+            long:'',
+            high:'',
+            width:''
+      }
+    };
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {
+    //获取物料层级
+    this.axios.post('/api/yy_material_type_list').then(res=>{
+        this.treeData = res.data;
+    })
+  //获取品牌
+  this.axios.get('/api/brand_list').then(res=>{
+    this.brandList = res.data.data;
+  })
+    //获取物料分类
+ this.axios.get('/api/basics_material_index').then(res=>{
+      this.materialList = res.data.data;
+      this.materialList.forEach(v=>{
+        v.is_select = false;
+      })
+    })
+  },
+  // 生命周期 - 挂载完成（可以访问DOM元素）
+  mounted() {
+  },
+  methods: {
+    handleSearch(){
+         this.proxyData = JSON.parse(JSON.stringify(this.searchData));
+         this.pageIndex=1;
+         this.initData(this.proxyData,this.selectID);
+    },
+    handleSelect(e){
+            this.pageIndex = 1;
+            this.selectID = e[0].ids;
+     this.initData(this.proxyData,e[0].ids);
+  
+    },
+    handleOnceTogether(){
+         this.axios.get('/api/change_data').then(res=>{
+          if(res.code==200){
+            this.$Message.success(res.msg);
+          }
+         })
+    },
+    initData(row,type_id) {
+      this.tableLoading = true;
+      this.axios({
+        method: "post",
+        url: "/api/yy_material_list",
+      data: {
+          ...row,
+          type_id,
+          page_index: this.pageIndex,
+          page_size: this.pageSize,
+        },
+      }).then((res) => {
+        this.tableLoading = false;
+        this.total = res.data.total;
+        this.tableData = res.data.data;
+      });
+    },
+    remove(root, node, data) {
+      if (node.children && node.children.length > 0) {
+        this.$Message.error("有子集时不可删除");
+      } else {
+        const parentKey = root.find((el) => el === node).parent;
+        const parent = root.find((el) => el.nodeKey === parentKey).node;
+        const index = parent.children.indexOf(data);
+        parent.children.splice(index, 1);
+      }
+    },
+    changeSize(e) {
+      this.pageSize = e;
+      this.pageIndex = 1;
+      this.initData(this.proxyData,this.selectID);
+    },
+    changePage(e) {
+      this.pageIndex = e;
+      this.initData(this.proxyData,this.selectID);
+    },
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  beforeCreate() {}, // 生命周期 - 创建之前
+  beforeMount() {}, // 生命周期 - 挂载之前
+  beforeUpdate() {}, // 生命周期 - 更新之前
+  updated() {}, // 生命周期 - 更新之后
+  beforeDestroy() {}, // 生命周期 - 销毁之前
+  destroyed() {}, // 生命周期 - 销毁完成
+  activated() {}, // 如果页面有keep-alive缓存功能，这个函数会触发
+};
+</script>
+
+<style lang='scss' scoped>
+.is_select{
+    background-color: #2d8cf0;
+    border: 1px solid #2d8cf0!important;
+    color: #ffffff;
+}
+.content {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  padding-top: 30px;
+  .content_left {
+    width: 10%;
+    height: 70vh;
+    border-right: 1px solid #515a6e;
+    overflow: auto;
+    // div{
+    //     width: 90%;
+    //     border-radius: 4px;
+    //     box-shadow: 2px 2px 2px #969daf;
+    //     font-size:16px;
+    //     text-align: center;
+    //     margin-top: 10px;
+    //     border: 1px solid #8f9296;
+    //     cursor: pointer;
+    // }
+  }
+  .content_right {
+    width: 88%;
+    .content_right_topform {
+      /deep/.ivu-form {
+        display: flex;
+        justify-content: flex-start;
+        flex-wrap: wrap;
+      }
+      /deep/.ivu-form-item {
+        display: inline-block;
+        width: 250px;
+      }
+      .content_right_topfrom_btn {
+        display: flex;
+        justify-content: flex-end;
+      }
+    }
+    .content_right_content {
+      border-top: 1px solid #f4f4f4;
+    //   margin-top: 20px;
+      padding-top: 20px;
+      .content_right_content_btn {
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+      }
+      .content_right_content_table {
+      }
+      .content_right_content_page {
+        display: flex;
+        justify-content: center;
+        padding-top: 20px;
+      }
+    }
+  }
+}
+.demo-tree-render {
+  width: 100%;
+}
+/deep/ .ivu-table-fixed-body{
+    height: auto!important;;
+ }
+</style>

src/views/PayrollRequisition/list.vue

@@ -225,6 +225,7 @@
 export default {
     data(){
         return{
+            fromType:null,
             printData:[],
             proxyData:{},
             keep:false,
@@ -313,6 +314,9 @@ export default {
     },
     mounted(){
         if(this.keep){
+            if(this.fromType==1){
+                this.page_index=1;
+            }
             this.initData(this.proxyData);
         }else{
             this.initData();
@@ -331,7 +335,7 @@ export default {
   item.upd_time =Number(item.upd_time)? this.func.replaceDate(item.upd_time):'';
             item.bigSize = this.digitUppercase(item.apply_price);
             this.printData = [item];
-            console.log(this.printData);
+            // console.log(this.printData);
      })
     await this.$print(this.$refs.print);
          }else{//批量打印
@@ -399,7 +403,7 @@ export default {
                     if(arr.length != this.selectData.length){
                         return this.$Message.warning('数据中有不能提交审批的数据！')
                     }
-                    console.log(arr);
+                    // console.log(arr);
                     let state = false;
                     arr.forEach(v=>{
                         if(v.state!=arr[0].state){
@@ -591,7 +595,7 @@ export default {
                  obj.check_start_time = obj.check_start_time?Date.parse(obj.check_start_time).toString().slice(0,10):'';
                 obj.check_end_time = obj.check_end_time?Date.parse(obj.check_end_time).toString().slice(0,10):'';
             }
-            console.log(row);
+            // console.log(row);
             this.loading = true;
           this.axios.post('/api/payment_list',{...obj,page_index:this.page_index,page_size:this.page_size}).then(res=>{
               this.tableData = res.data.data;
@@ -626,6 +630,8 @@ export default {
                searchData:this.searchData
           }; 
            localStorage.setItem("requisitionData", JSON.stringify(requisitionData));   
+      }else{
+        localStorage.removeItem('requisitionData');
       }
       next();
     },
@@ -633,7 +639,7 @@ export default {
         if(from.path =="/cms/PayrollRequisition/edit"||from.path=="/cms/PayrollRequisition/detail"){
              let requisitionData = JSON.parse(localStorage.getItem('requisitionData'));
             next(vm=>{
-
+                  vm.fromType = from.query.type;
                   vm.page_index = requisitionData.page_index;
                   vm.page_size = requisitionData.page_size;
                   vm.searchData = requisitionData.searchData;

src/views/ProductionOrderList/Deliverylist/DeliveryDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <FullPage
-      :title=" '发货单详情'"
+      :title="'发货单详情'"
       :list="list"
       @init="init"
       :logList="logList"
@@ -9,6 +9,7 @@
       @searchData="init"
       @changePage="changePage"
       @changeSize="changeSize"
+      :choose_index="chooseIndex"
       @selectTable="selectTable"
       :tableColums="tableColums"
       :tableData="tableData"
@@ -16,22 +17,17 @@
       :total="total"
     >
       <div slot="titleButton">
-         <Button
-          @click="exportContent"
-          type="primary"
-        
-         
-          style="margin-right: 10px"
+        <Button @click="exportContent" type="primary" style="margin-right: 10px"
           >导出</Button
-        > 
+        >
         <Button
           v-if="$route.query.type == 2"
           @click="handleOrderReturn(selects)"
           type="primary"
-          style="margin-right:10px;"
+          style="margin-right: 10px"
           >撤销发货</Button
         >
-        <Button @click="back" type="primary" ghost style="margin-right:10px;"
+        <Button @click="back" type="primary" ghost style="margin-right: 10px"
           >返回</Button
         >
         <Button
@@ -39,21 +35,21 @@
           @click="exportData"
           type="warning"
           ghost
-          style="margin-right:10px;"
+          style="margin-right: 10px"
           >待出库清单打印</Button
         >
-         <Button
+        <Button
           @click="outShip(selects, 1)"
           type="warning"
           ghost
-          style="margin-right:10px;"
+          style="margin-right: 10px"
           >批量发货完成</Button
         >
         <Button
           @click="outShip(selects, 2)"
           type="success"
           ghost
-          style="margin-right:10px;"
+          style="margin-right: 10px"
           >批量收货完成</Button
         >
       </div>
@@ -87,12 +83,17 @@
         <a
           class="map-margin"
           @click="outShip([row.orders_procedure_id], 1)"
-          v-show="row.in_out_value==0"
-          > 发货完成 </a
+          v-show="row.in_out_value == 0"
+        >
+          发货完成 </a
         ><a
           class="map-margin"
-          v-show='row.transportation_value==0&&row.in_out_value==1'
-          @click="row.in_out_value == 1?outShip([row.orders_procedure_id], 2):$Message.warning('请先确认发货')"
+          v-show="row.transportation_value == 0 && row.in_out_value == 1"
+          @click="
+            row.in_out_value == 1
+              ? outShip([row.orders_procedure_id], 2)
+              : $Message.warning('请先确认发货')
+          "
           >收货完成</a
         >
       </template>
@@ -145,6 +146,7 @@ import { mapActions } from "vuex";
 export default {
   data() {
     return {
+      chooseIndex: [],
       list: [
         {
           title: "楼幢",
@@ -201,51 +203,52 @@ export default {
           serverName: "url_number",
           placeholder: "请选择图号",
           value: "",
-          multiple:true,
-          filterable:true,
+          multiple: true,
+          filterable: true,
           option: [],
         },
         {
           title: "部件",
           name: "Select",
           serverName: "part",
-           filterable: true,
+          filterable: true,
           placeholder: "请选择部件",
           value: "",
           option: [],
         },
-         {
-            title: "发货状态",
-            name: "Select",
-            serverName: "in_out_value",
-            value: "",
-            option: [
-              { label: "已发货", value: 1 },
-              { label: "未发货", value: 0 },
-            ],
-          },
-           {
-            title: "收货状态",
-            name: "Select",
-            serverName: "transportation_value",
-            value: "",
-            option: [
-              { label: "已收货", value: 1 },
-              { label: "未收货", value: 0 },
-            ],
-          },
-          {
-            title:'图号批量查询：',
-            value:"",
-            name:'Input',
-            serverName:'url_numbers',
-            placeholder:'请输入',
-            clearable:false,
-          }
+        {
+          title: "发货状态",
+          name: "Select",
+          serverName: "in_out_value",
+          value: "",
+          option: [
+            { label: "已发货", value: 1 },
+            { label: "未发货", value: 0 },
+          ],
+        },
+        {
+          title: "收货状态",
+          name: "Select",
+          serverName: "transportation_value",
+          value: "",
+          option: [
+            { label: "已收货", value: 1 },
+            { label: "未收货", value: 0 },
+          ],
+        },
+        {
+          title: '图号批量查询：',
+          value: "",
+          name: 'Input',
+          serverName: 'url_numbers',
+          placeholder: '请输入',
+          clearable: false,
+        }
       ],
       logList: [],
       tableColums: [
-        { type: "selection", align: "center", width: "100", fixed: "left" },
+        { type: "selection", align: "center", width: "90", fixed: "left" },
+        { type: 'index', align: 'center', width: '80', fixed: 'left', title: '序号' },
         {
           title: "房间号",
           align: "center",
@@ -255,7 +258,7 @@ export default {
             const { row } = params;
             return h(
               "span",
-              `${row.house?`${row.house}-`:''}${row.unit?`${row.unit}-`:''}${row.layer?`${row.layer}-`:''}${row.number_detail}`
+              `${row.house ? `${row.house}-` : ''}${row.unit ? `${row.unit}-` : ''}${row.layer ? `${row.layer}-` : ''}${row.number_detail}`
             );
           },
         },
@@ -268,7 +271,7 @@ export default {
         { title: "图号", align: "center", minWidth: 200, key: "url_number" },
         { title: "组合名称", align: "center", minWidth: 200, key: "compose_name" },
         { title: "部件", align: "center", minWidth: 200, key: "part_title" },
-        {title:'精裁尺寸',align:'center',minWidth:150,key:'measure'},
+        { title: '精裁尺寸', align: 'center', minWidth: 150, key: 'measure' },
         {
           title: "零部件",
           align: "center",
@@ -290,7 +293,7 @@ export default {
                 : '已发货'
             ),
         },
-         {
+        {
           title: "收货状态",
           align: "center",
           minWidth: 200,
@@ -347,20 +350,20 @@ export default {
   methods: {
     async exportContent() {
       const res = await this.axios("/api/transport_export", {
-        params: { transport_no:this.$route.query.transport_no },
+        params: { transport_no: this.$route.query.transport_no },
       });
       if (res.code == 200) {
-      
+
         let url = `${this.$store.state.ip}/api/storage/${res.data.file}`;
         location.href = url;
       }
     },
-      outDelivery(row){
-         this.info.order_in_no = Array.isArray(row)
+    outDelivery(row) {
+      this.info.order_in_no = Array.isArray(row)
         ? row.join(",")
         : row.order_in_no;
       this.showStock = true;
-      },
+    },
     init(row) {
       this.axios("/api/user").then((res) => (this.users = res.data.data));
       this.pageIndex = 1;
@@ -393,7 +396,7 @@ export default {
         params: {
           order_no: this.$route.query.order_no,
           type: this.$route.query.type,
-          transport_no:this.$route.query.transport_no
+          transport_no: this.$route.query.transport_no
         },
       }).then((res) => {
         res.data.house.map((v) => {
@@ -440,12 +443,14 @@ export default {
       });
     },
     changePage(e) {
+      this.chooseIndex = [];
       this.pageIndex = e;
       this.proxyObj.page_index = e;
       this.getData(this.proxyObj);
     },
     changeSize(e) {
       this.pageSize = e;
+      this.chooseIndex = [];
       this.proxyObj.page_size = this.pageSize;
       this.getData(this.proxyObj);
     },
@@ -479,16 +484,23 @@ export default {
             }
           });
         },
-        onCancel: () => {},
+        onCancel: () => { },
       });
     },
     selectTable(row) {
+      this.chooseIndex = [];
+      console.log(row);
+      this.tableData.forEach((v, index) => {
+        if (row.find(c => (c.pr_id == v.pr_id))) {
+          this.chooseIndex.push(index + 1);
+        }
+      })
+      console.log(this.chooseIndex);
       this.selectedReturnArr = row;
-        this.selects = [];
+      this.selects = [];
       row.forEach(v => {
         this.selects.push(v.orders_procedure_id)
       });
-      console.log(this.selects)
     },
     confirmSuccess(row) {
       let params = "";
@@ -562,17 +574,17 @@ export default {
                 }
               });
           },
-          cancel: (e) => {},
+          cancel: (e) => { },
         });
       } else {
         if (!row || row.length < 1) {
           return this.$Message.error("请至少选择一项");
         }
-        if(type == 2){
-          let arr = this.selectedReturnArr.filter(v=>{
-            return v.in_out_value==0
+        if (type == 2) {
+          let arr = this.selectedReturnArr.filter(v => {
+            return v.in_out_value == 0
           });
-          if(arr.length>0){
+          if (arr.length > 0) {
             return this.$Message.warning('有未发货的数据不能收货')
           }
         }
@@ -594,7 +606,7 @@ export default {
               }
             });
           },
-          cancel: (e) => {},
+          cancel: (e) => { },
         });
       }
     },

src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="height:100%">
+  <div style="height: 100%">
     <FullPage
       title="生产排产列表"
       :list="set_list"
@@ -8,12 +8,12 @@
       @selectTable="selectTable"
       @changePage="changePage"
       @changeSize="changeSize"
-      @changeSelected='tooltip_change'
-      @total_choose='total_choose'
+      @changeSelected="tooltip_change"
+      @total_choose="total_choose"
       :tableColums="computedTable"
       :tableData="tableData"
       :showPage="false"
-      :tooltip_data='tooltip_data'
+      :tooltip_data="tooltip_data"
       :page_index="page_index"
       :loading="loading"
       :total="total"
@@ -22,7 +22,7 @@
         <Button
           v-if="persimissionData['分类派工'] || persimissionData.all"
           type="primary"
-          style="margin-right:10px"
+          style="margin-right: 10px"
           @click="handleDispatchType(selects)"
           ghost
           >批量派工</Button
@@ -61,7 +61,7 @@
         <div>
           <a
             v-if="persimissionData['详情'] || persimissionData.all"
-            style="margin:0 5px"
+            style="margin: 0 5px"
             @click="goDetail(row)"
             >详情</a
           >
@@ -72,7 +72,7 @@
             >派工单</a
           > -->
         </div>
-      </template> 
+      </template>
       <template slot="pageSlot">
         <div class="pageSlotStyle">
           <Page
@@ -88,7 +88,7 @@
         </div>
       </template>
     </FullPage>
-     <Modal
+    <Modal
       v-model="showModal"
       title="设置"
       @on-ok="handleModalOk"
@@ -128,12 +128,12 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
-      setTableColumns:[],
-      url_number:[],
-      tooltip_data:'',
+      setTableColumns: [],
+      url_number: [],
+      tooltip_data: '',
       loading: true,
-      url_number_list:[],
-        tableModalColumns: [
+      url_number_list: [],
+      tableModalColumns: [
         {
           title: "是否展示",
           align: "center",
@@ -189,7 +189,7 @@ export default {
           },
         },
       ],
-        tableModalTableData: [
+      tableModalTableData: [
         { is_show: true, key: "selection", value: "全选", title: "全选" },
         {
           is_show: true,
@@ -267,7 +267,7 @@ export default {
         },
         { is_show: true, key: "set", value: "操作", title: "操作" },
       ],
-       formModalColumns: [
+      formModalColumns: [
         {
           title: "是否展示",
           align: "center",
@@ -380,8 +380,9 @@ export default {
           key: "residential_name",
           minWidth: 200,
         },
-         { title: "图号", align: "center", key: "url_number", minWidth: 200,ellipsis:'true',tooltip:'true'
-          },
+        {
+          title: "图号", align: "center", key: "url_number", minWidth: 200, ellipsis: 'true', tooltip: 'true'
+        },
         { title: "计划单号", align: "center", key: "plan_no", minWidth: 200 },
         // {
         //   title: "订单类型",
@@ -394,9 +395,9 @@ export default {
         // },
       ],
       tableData: [],
-      showModal:false,
+      showModal: false,
       page_index: 1,
-      currencyPageId:null,
+      currencyPageId: null,
       page_size: 10,
       total: 0,
       proxyObj: {},
@@ -408,7 +409,7 @@ export default {
     };
   },
   // beforeRouteEnter(to, from, next) {
-   
+
   //     if (from.path == "/cms/productionorderlist/productionplanlist/details"||from.path=='/cms/Dispatching/Dispatching') {
   //       next(vm=>{
   //            vm.proxyObj = JSON.parse(localStorage.getItem('proxyObj'));
@@ -434,16 +435,16 @@ export default {
   //   next((vm) => {});
   // },
   created() {
-     this.axios.post("/api/orders_produce_plan_list", {page_size:this.page_size,page_index:this.page_index}).then(
-        (res) => {
-         let data =[];
-          res.data.url_number_list.map(v=>{
-           let obj={};
-           obj.title =v;
-           data.push(obj)
-          })
-          this.url_number_list = data;
-          })
+    this.axios.post("/api/orders_produce_plan_list", { page_size: this.page_size, page_index: this.page_index }).then(
+      (res) => {
+        let data = [];
+        res.data.url_number_list.map(v => {
+          let obj = {};
+          obj.title = v;
+          data.push(obj)
+        })
+        this.url_number_list = data;
+      })
     // 获取紧急程度
     this.axios.get("/api/warning_list").then((res) => {
       this.warningList = res.data.data;
@@ -458,73 +459,73 @@ export default {
     ...mapState(["persimissionData"]),
     computedTable() {
       // if (this.tableheaders.length < 1) {
-      return [...this.tableColums,...this.setTableColumns, 
-       {
-          title: "订单状态",
-          align: "center",
-          key: "state",
-          minWidth: 150,
-          render: (h, params) =>
-            h(
-              "span",
-              {},
-              params.row.state == 0
-                ? "未派工"
-                : params.row.state == 1
+      return [...this.tableColums, ...this.setTableColumns,
+      {
+        title: "订单状态",
+        align: "center",
+        key: "state",
+        minWidth: 150,
+        render: (h, params) =>
+          h(
+            "span",
+            {},
+            params.row.state == 0
+              ? "未派工"
+              : params.row.state == 1
                 ? "派工中"
                 : params.row.state == 2
-                ? "完成"
-                : ""
-            ),
-        },
-        // { title: "业务员", align: "center", key: "nickname", minWidth: 150 },
-        {
-          title: "紧急程度",
-          align: "center",
-          key: "warning_state",
-          minWidth: 150,
-          slot: "basicTypeSet",
-        },
-        {
-          title: "计划开始时间",
-          align: "center",
-          minWidth: 200,
-          key: "plan_start_time",
-          render: (h, params) =>
-            h("span", {}, this.func.replaceDate(params.row.plan_start_time, 1)),
-        },
-        {
-          title: "计划结束时间",
-          align: "center",
-          minWidth: 200,
-          key: "plan_end_time",
-          render: (h, params) =>
-            h("span", {}, this.func.replaceDate(params.row.plan_end_time, 1)),
-        },
-        {
-          title: "生产进度",
-          align: "center",
-          key: "complete_rate",
-          minWidth: 100,
-          render: (h, params) =>
-            h("span", {}, parseInt(params.row.complete_rate * 100) + "%"),
-        },
-        {
-          title: "预估交付日期",
-          align: "center",
-          key: "predict_time",
-          minWidth: 200,
-          render: (h, params) =>
-            h("span", {}, this.func.replaceDate(params.row.predict_time, 1)),
-        },
+                  ? "完成"
+                  : ""
+          ),
+      },
+      // { title: "业务员", align: "center", key: "nickname", minWidth: 150 },
       {
-          title: "操作",
-          align: "center",
-          key: "set",
-          slot: "set",
-          fixed: "right",
-          width: "150",
-        }]
+        title: "紧急程度",
+        align: "center",
+        key: "warning_state",
+        minWidth: 150,
+        slot: "basicTypeSet",
+      },
+      {
+        title: "计划开始时间",
+        align: "center",
+        minWidth: 200,
+        key: "plan_start_time",
+        render: (h, params) =>
+          h("span", {}, this.func.replaceDate(params.row.plan_start_time, 1)),
+      },
+      {
+        title: "计划结束时间",
+        align: "center",
+        minWidth: 200,
+        key: "plan_end_time",
+        render: (h, params) =>
+          h("span", {}, this.func.replaceDate(params.row.plan_end_time, 1)),
+      },
+      {
+        title: "生产进度",
+        align: "center",
+        key: "complete_rate",
+        minWidth: 100,
+        render: (h, params) =>
+          h("span", {}, parseInt(params.row.complete_rate * 100) + "%"),
+      },
+      {
+        title: "预估交付日期",
+        align: "center",
+        key: "predict_time",
+        minWidth: 200,
+        render: (h, params) =>
+          h("span", {}, this.func.replaceDate(params.row.predict_time, 1)),
+      },
+      {
+        title: "操作",
+        align: "center",
+        key: "set",
+        slot: "set",
+        fixed: "right",
+        width: "150",
+      }]
       // }
       // return this.func.computedHeader(this.tableheaders, this.tableColums)
     },
@@ -546,9 +547,9 @@ export default {
         },
         {
           title: "图号",
-          isTooltip:true,
-          width:'160',
-          change:true,
+          isTooltip: true,
+          width: '160',
+          change: true,
           name: "Select",
           serverName: "url_number",
           placeholder: "请选择",
@@ -556,7 +557,7 @@ export default {
           optionName: "title",
           optionValue: "title",
           option: this.url_number_list,
-          multiple:true
+          multiple: true
         },
         // {
         //   title: "订单类型",
@@ -621,42 +622,43 @@ export default {
           ],
         },
         {
-          title:'图号批量查询',
-          name:'Input',
-          serverName:'url_numbers',
-          value:'',
-          clearable:false,
-          placeholder:'请输入'
+          title: '图号批量查询',
+          name: 'Input',
+          serverName: 'url_numbers',
+          value: '',
+          clearable: false,
+          placeholder: '请输入'
         },
-         {title:'批次',
-        name:'Input',
-        clearable:false,
-        serverName:'numbers',
-        placeholder:'请输入'
+        {
+          title: '批次',
+          name: 'Input',
+          clearable: false,
+          serverName: 'numbers',
+          placeholder: '请输入'
         }
       ];
     },
   },
   methods: {
-    total_choose(e){
-      let data=[];
-     if(e[2].value.indexOf('全选')>=0){
-        e[2].option.forEach(v=>{
+    total_choose(e) {
+      let data = [];
+      if (e[2].value.indexOf('全选') >= 0) {
+        e[2].option.forEach(v => {
           data.push(v.title)
         })
         data.unshift('全选')
-         this.set_list[2].value = data;
+        this.set_list[2].value = data;
         this.url_number = data;
-     }else{
-       this.set_list[2].value = [];
-       this.url_number = [];
-     }
+      } else {
+        this.set_list[2].value = [];
+        this.url_number = [];
+      }
     },
-    tooltip_change(e){
-          this.tooltip_data = e[2].value.toString();
+    tooltip_change(e) {
+      this.tooltip_data = e[2].value.toString();
     },
-    handleModalOk(){
-        this.formModalTableData.forEach((element, index) => {
+    handleModalOk() {
+      this.formModalTableData.forEach((element, index) => {
         element.sort = index;
       });
       this.tableModalTableData.forEach((element, index) => {
@@ -687,19 +689,19 @@ export default {
       //       this.getData(this.proxyObj);
       // }else{
       row.sub_state = 5;
-        this.page_index = 1;
-        row.page_index = this.page_index;
-        row.page_size = this.page_size;
-        this.proxyObj = row;
-        this.getData(row);
+      this.page_index = 1;
+      row.page_index = this.page_index;
+      row.page_size = this.page_size;
+      this.proxyObj = row;
+      this.getData(row);
       // }
     },
     searchData(row) {
-        this.page_index = 1;
-        row.page_index = this.page_index;
-        row.page_size = this.page_size;
-        this.proxyObj = row;
-        this.getData(row);
+      this.page_index = 1;
+      row.page_index = this.page_index;
+      row.page_size = this.page_size;
+      this.proxyObj = row;
+      this.getData(row);
     },
     changePage(e) {
       this.page_index = e;
@@ -717,21 +719,21 @@ export default {
         (res) => {
           this.tableData = res.data.data;
           let header = [];
-          if(res.data.header&&res.data.header.length!=0){
-              res.data.header.forEach(v=>{
-                let obj = {};
-                obj.title = `${v.title}状态`;
-                obj.align = 'center';
-                obj.minWidth = 120;
-                obj.key = v.key;
-                obj.render = (h,params)=>{
-                  const {row} = params;
-                  return h('span',{},row[v.key]==0?'未派工':row[v.key]==1?'派工中':'已派工')
-                }
-                header.push(obj);
-          })
+          if (res.data.header && res.data.header.length != 0) {
+            res.data.header.forEach(v => {
+              let obj = {};
+              obj.title = `${v.title}状态`;
+              obj.align = 'center';
+              obj.minWidth = 120;
+              obj.key = v.key;
+              obj.render = (h, params) => {
+                const { row } = params;
+                return h('span', {}, row[v.key] == 0 ? '未派工' : row[v.key] == 1 ? '派工中' : '已派工')
+              }
+              header.push(obj);
+            })
           }
-        
+
           this.setTableColumns = header;
           this.total = res.data.total;
           // this.tableheaders = res.data.tableSet || []
@@ -749,7 +751,7 @@ export default {
         },
       });
     },
-     onDragDrop(a, b, table, type) {
+    onDragDrop(a, b, table, type) {
       if (type == 2 && (a == 0 || b == 0)) {
         return this.$Message.warning("全选位置不可变");
       }
@@ -757,18 +759,14 @@ export default {
     },
     handleDispatchType(row) {
       // console.log("row :>> ", row);
-      this.axios.post('/api/order_produce_list').then(res=>{
-        if(res.code == 200){
-             this.$router.push({
-        path: "/cms/Dispatching/Dispatching",
-        query: {
-          order_no: row.order_no,
-          plan_no: row.plan_no,
-        },
-      });
+      this.axios.get('/api/frock_list').then(res => {
+        if (res.code == 200) {
+          this.$router.push({
+            path: "/cms/Dispatching/Dispatching",
+          });
         }
       })
-     
+
     },
     dispatchList(row) {
       this.dispatchOrder({
@@ -784,7 +782,7 @@ export default {
       this.selects = result;
     },
     setupTableHeader() {
-       this.showModal = true;
+      this.showModal = true;
       return;
       // this.tableheaders.length < 1
       //   ? (this.tableheaders = this.tableColums.reduce(
@@ -802,17 +800,17 @@ export default {
       //       .then((res) => {
       //         if (res.code == 200) {
       //           this.$Message.success(res.msg);
-                // let data =[];
-                // for(let i = 0 ; i++ ; i<this.tableColums){
-                //   if(this.tableColums[i].title.indexOf(result)>=0){
-                //              data.push(this.tableColums[i])
-                //   }
-                // }
-                // this.computedTable = data
-       //       }
+      // let data =[];
+      // for(let i = 0 ; i++ ; i<this.tableColums){
+      //   if(this.tableColums[i].title.indexOf(result)>=0){
+      //              data.push(this.tableColums[i])
+      //   }
+      // }
+      // this.computedTable = data
+      //       }
       //      });
-     //   },
-    //  });
+      //   },
+      //  });
     },
   },
 };

src/views/Warehouse/Warehouse/list.vue

@@ -35,12 +35,12 @@
       </div>
       <template slot='set'
                 slot-scope='{row,index}'>
-        <div class="table-set">
-          <a style="margin:0 5px"
+       
+          <a style="margin-right:20px"
              @click="handleSet(row,index,1)">编辑</a>
-          <a style="margin:0 5px;color:red"
+          <a style="color:red"
              @click="handleSet(row,index,2)">删除</a>
-        </div>
+       
       </template>
     </FullPage>
     <Modal :title="type==3?'新增仓库':'编辑仓库'"
@@ -67,6 +67,11 @@
                   :key="item.id">{{ item.title }}</Option>
         </Select>
       </div>
+       <div class="modal_div">
+        <span>仓库编码 :</span> <Input v-model="info.code"
+               placeholder="请输入仓库编码"
+               style="width:200px" />
+      </div>
       <div class="modal-footer"
            slot="footer">
         <Button @click="showModal=false">取消</Button>
@@ -97,9 +102,10 @@ export default {
       ],
       tableColums: [
         { title: '序号', type: 'index', align: 'center', key: 'id',resizable:true, width: 150 },
+        {title:"仓库编码",align:'center',key:'code',minWidth:120},
         { title: '仓库名称', align: 'center', key: 'title', resizable:true,width: 500 },
         { title: '仓库分类', align: 'center', key: 'type_title', resizable:true,width: 500 },
-        { title: '操作', align: 'center', slot: 'set', minWidth: 150, fixed: 'right' },
+        { title: '操作', align: 'center', slot: 'set', minWidth: 120, fixed: 'right' },
       ],
       tableData: [],
       showModal: false,
@@ -111,7 +117,8 @@ export default {
       info: {
         id: '',
         title: '',
-        type_id: ''
+        type_id: '',
+        code:"",
       },
       type: null,
     }
@@ -135,9 +142,7 @@ export default {
         method: 'post',
         url: '/api/warehouse_edit',
         data: {
-          id: this.info.id,
-          title: this.info.title,
-          type_id: this.info.type_id
+          ...this.info
         }
       }).then((res) => {
         this.$Message.success(res.msg)

src/views/cms.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="content">
-    <Header @handleTitleClick="handleTitleClick" ref="header"/>
+    <Header @handleTitleClick="handleTitleClick" ref="header" />
     <div class="page">
-      <div class="navigation" v-show="navgationData.length!=0">
+      <div class="navigation" v-show="navgationData.length != 0">
         <Navgation :navgationData="navgationData" @menuSelect="menuSelect" />
       </div>
 
-      <div :class="navgationData.length!=0?'router-map':'router-none'">
-        <Crumbs :crumbs="crumbs" v-show="navgationData.length!=0"/>
+      <div :class="navgationData.length != 0 ? 'router-map' : 'router-none'">
+        <Crumbs :crumbs="crumbs" v-show="navgationData.length != 0" />
         <transition :name="transitionName">
           <keep-alive>
             <router-view
@@ -46,7 +46,7 @@ import { mapState, mapMutations, mapActions } from "vuex";
 export default {
   data() {
     return {
-      w_arr:[],
+      w_arr: [],
       transitionName: "slide-left",
       // navgationData:[]
     };
@@ -64,29 +64,29 @@ export default {
   },
   created() {
     this.undata_side_navData();
-     if(!sessionStorage.getItem('open-menu')){
-       console.log(1)
-        this.axios({ method: "get", url: "/api/menu" }).then((res) => {
+    if (!sessionStorage.getItem('open-menu')) {
+      console.log(1)
+      this.axios({ method: "get", url: "/api/menu" }).then((res) => {
         this.w_arr = res.data;
-      // this.undata_navData();
-       this.handleTitleClick(this.w_arr[0]) 
-    });
-    
-       
-     }
+        // this.undata_navData();
+        this.handleTitleClick(this.w_arr[0])
+      });
+
+
+    }
   },
-//   beforeRouteEnter(to, from, next){
-//     next();
-//      if(!sessionStorage.getItem('open-menu')){
-//        console.log(1)
-//        let arr = [];
-//         this.axios({ method: "get", url: "/api/menu" }).then((res) => {
-//         arr = res.data;
-//       // this.undata_navData();
-//     });
-//         this.handleTitleClick(arr[0]) 
-//      }
-//  },
+  //   beforeRouteEnter(to, from, next){
+  //     next();
+  //      if(!sessionStorage.getItem('open-menu')){
+  //        console.log(1)
+  //        let arr = [];
+  //         this.axios({ method: "get", url: "/api/menu" }).then((res) => {
+  //         arr = res.data;
+  //       // this.undata_navData();
+  //     });
+  //         this.handleTitleClick(arr[0]) 
+  //      }
+  //  },
   mounted() {
     if (sessionStorage.getItem("crumbs")) {
       let data = JSON.parse(sessionStorage.getItem("crumbs"));
@@ -106,7 +106,7 @@ export default {
         this.$store.commit("updateCrumbs", { s });
         sessionStorage.setItem(
           "crumbs",
-          JSON.stringify({ parantData, childData, lastChild })
+          JSON.stringify({ parantData: s, childData: {}, lastChild: {} })
         );
         return this.$router.push({
           path: data[name].page,
@@ -158,56 +158,56 @@ export default {
       let page = nextEndChild
         ? nextEndChild.page
         : endChild
-        ? endChild.page
-        : lastChild
-        ? lastChild.page
-        : childData.page;
+          ? endChild.page
+          : lastChild
+            ? lastChild.page
+            : childData.page;
       let title = nextEndChild
         ? nextEndChild.title
         : endChild
-        ? endChild.title
-        : lastChild
-        ? lastChild.title
-        : childData.title;
-         let version = nextEndChild
+          ? endChild.title
+          : lastChild
+            ? lastChild.title
+            : childData.title;
+      let version = nextEndChild
         ? nextEndChild.version
         : endChild
-        ? endChild.version
-        : lastChild
-        ? lastChild.version
-        : childData.version;
+          ? endChild.version
+          : lastChild
+            ? lastChild.version
+            : childData.version;
       let id = nextEndChild
         ? nextEndChild.id
         : endChild
-        ? endChild.id
-        : lastChild
-        ? lastChild.id
-        : childData.id || "";
+          ? endChild.id
+          : lastChild
+            ? lastChild.id
+            : childData.id || "";
       this.$router.push({
         path: page,
         query: {
           title: title,
           id: id,
           permisssions_id: permisssions_id,
-          version:version,
+          version: version,
         },
       });
     },
     handleTitleClick(row) {
-    if(row.type==1){
-          this.$router.push({path:row.page});
-          this.$store.commit("updataNavgation", row.sub);
-      sessionStorage.setItem("navgation", JSON.stringify(row.sub));
-    }else{
-      this.$store.commit("updataNavgation", row.sub);
-      sessionStorage.setItem("navgation", JSON.stringify(row.sub));
-      // if (row.title == '首页') {
-      this.$router.push({ path: "/cms/home", query: { title: "首页" } });
-      // } else {
-      // }
-    }
+      if (row.type == 1) {
+        this.$router.push({ path: row.page });
+        this.$store.commit("updataNavgation", row.sub);
+        sessionStorage.setItem("navgation", JSON.stringify(row.sub));
+      } else {
+        this.$store.commit("updataNavgation", row.sub);
+        sessionStorage.setItem("navgation", JSON.stringify(row.sub));
+        // if (row.title == '首页') {
+        this.$router.push({ path: "/cms/home", query: { title: "首页" } });
+        // } else {
+        // }
+      }
     }
-      
+
   },
   components: { Header, Navgation, Crumbs },
 };
@@ -243,8 +243,8 @@ export default {
       padding: 0;
     }
   }
-  .router-none{
-     width: calc(100%);
+  .router-none {
+    width: calc(100%);
     height: 100%;
     padding: 10px 20px;
     background: #f0f1f4;

src/views/leadMatch/roomList/BSTlist.vue

@@ -15,27 +15,33 @@
           padding-top: 10px;
         "
       >
-        <Button type="primary" size="small" style="margin-right: 10px" @click="gotoPage(3)"
+        <Button
+          type="primary"
+          size="small"
+          style="margin-right: 10px"
+          @click="gotoPage(3)"
           >新增</Button
         >
       </div>
       <Table :columns="tableColumns" border :data="tableData">
-        <template slot="make_data" slot-scope="{row}">
-          <span>{{func.replaceDateNoHMS(row.crt_time)}}</span>
+        <template slot="make_data" slot-scope="{ row }">
+          <span>{{ func.replaceDateNoHMS(row.crt_time) }}</span>
         </template>
-     </Table>
+      </Table>
+    </div>
+    <div class="content_body_page">
+      <Page
+        :page-size-opts="[10, 20, 30, 40, 100]"
+        @on-page-size-change="changeSize"
+        @on-change="changePage"
+        :current="pageIndex"
+        show-total
+        show-elevator
+        :total="total"
+        show-sizer
+        :page-size="pageSize"
+      />
     </div>
-      <div class="content_body_page">
-          <Page :page-size-opts="[10, 20, 30, 40,100]"
-                @on-page-size-change='changeSize'
-                @on-change='changePage'
-                :current='pageIndex'
-                show-total
-                show-elevator
-                :total="total"
-                show-sizer
-                :page-size='pageSize' />
-        </div>
   </div>
 </template>
 <script>
@@ -78,148 +84,136 @@ export default {
         // },
       ],
       tableColumns: [
-        { title: "项目编码", key: "project_number", align: "center", resizable: true,
-                        width: 350},
-        { title: "项目名称", key: "project_name", align: "center", resizable: true,
-                        width: 350},
-        { title: "项目简称", key: "abbreviation", align: "center",resizable: true,
-                        width: 350},
+        {
+          title: "项目编码", key: "project_number", align: "center", resizable: true,
+          width: 350
+        },
+        {
+          title: "项目名称", key: "project_name", align: "center", resizable: true,
+          width: 350
+        },
+        {
+          title: "项目简称", key: "abbreviation", align: "center", resizable: true,
+          width: 350
+        },
         // { title: "匹配状态", key: "state", align: "center", minWidth: 140 ,
         // render:(h,params)=>{
         //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
         // }},
-        { title: "制单日期", key: "make_data", align: "center", resizable: true,
-                        width: 350 ,slot:"make_data"},
-        { title: "操作", key:'',align: "center", minWidth: 150 , 
-         render: (h, params) => {
-                            return h('div', [
-                                h('a', { style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.gotoPage(1,params.row)
-                                        }
-                                    }
-                                    }, '编辑'),
-                                h('a', { style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.gotoPage(2,params.row)
-                                        }
-                                    }
-                                    }, '查看'),
-                                h('a',{ style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.del(params.row)
-                                        }
-                                    }},'删除')
-                            ]);
-                        }},
+        {
+          title: "制单日期", key: "make_data", align: "center", resizable: true,
+          width: 350, slot: "make_data"
+        },
+        {
+          title: "操作", key: '', align: "center", minWidth: 150,
+          render: (h, params) => {
+            return h('div', [
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.gotoPage(1, params.row)
+                  }
+                }
+              }, '编辑'),
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.gotoPage(2, params.row)
+                  }
+                }
+              }, '查看'),
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.del(params.row)
+                  }
+                }
+              }, '删除')
+            ]);
+          }
+        },
       ],
       tableData: [],
-      pageIndex: JSON.parse(localStorage.getItem("pageIndex")) || 1,
-      pageSize: JSON.parse(localStorage.getItem("pageSize")) || 10,
+      pageIndex: 1,
+      pageSize: 10,
       total: 0,
+      proxyData: {},
     };
   },
   mounted() {
-    if (localStorage.getItem("list")) {
-      this.list = JSON.parse(localStorage.getItem("list"));
-    }
-    if (localStorage.getItem("searchList")) {
-      this.$nextTick(() => {
-        this.initData(JSON.parse(localStorage.getItem("searchList")));
-      });
-    }
+    this.initData();
   },
   methods: {
-    searchData(){
+    searchData(row) {
       this.pageIndex = 1;
       this.pageSize = 10;
-      let row = {};
-      this.list.forEach((e) => {
-        if (e.serverName == "project_number") {
-          this.$set(row, "project_number", e.value);
-        }
-        if (e.serverName == "project_name") {
-          this.$set(row, "project_name", e.value);
-        }
-        if (e.serverName == "abbreviation") {
-          this.$set(row, "abbreviation", e.value);
-        }
-        // this.$set(对象, key, 数组);
-      });
-      localStorage.setItem("searchList", JSON.stringify(row));
+      this.proxyData = JSON.parse(JSON.stringify(row));
       this.initData(row);
     },
     initData(row) {
       console.log(row)
-      this.axios.get('/api/cut_order_list',{params:{
-        page_index:this.pageIndex,
-        page_size:this.pageSize,
-        order_type:2,
-        ...row
-        }}).then(res=>{
+      this.axios.get('/api/cut_order_list', {
+        params: {
+          page_index: this.pageIndex,
+          page_size: this.pageSize,
+          order_type: 2,
+          ...row
+        }
+      }).then(res => {
         this.tableData = res.data.data;
         this.total = res.data.total;
       })
     },
-    del(row){
-           this.confirmDelete({
-                content:'是否删除？',
-                title:'房间删除',
-                type:'primary',
-                then:()=>{
-                      this.axios.post('/api/cut_order_delete',{cut_order_id:row.id,order_type:2}).then(()=>{
-            this.initData()
+    del(row) {
+      this.confirmDelete({
+        content: '是否删除？',
+        title: '房间删除',
+        type: 'primary',
+        then: () => {
+          this.axios.post('/api/cut_order_delete', { cut_order_id: row.id, order_type: 2 }).then(() => {
+            this.initData(this.proxyData);
           })
-                },
-                cancel:()=>{}
-            })
-         
+        },
+        cancel: () => { }
+      })
+
     },
-    gotoPage(type,row){
-      localStorage.setItem("list", JSON.stringify(this.list));
-      localStorage.setItem("pageSize", this.pageSize);
-      localStorage.setItem("pageIndex", this.pageIndex);
+    gotoPage(type, row) {
       //1 编辑 2 查看 3 新增
-      switch(type){
+      switch (type) {
         case 1:
-          case 2:this.$router.push({ path: '/cms/leadMatch/roomList/BSTedit', query: { type:type,cut_order_id:row.id} });
+        case 2: this.$router.push({ path: '/cms/leadMatch/roomList/BSTedit', query: { type: type, cut_order_id: row.id } });
           break
-          case 3:this.$router.push({ path: '/cms/leadMatch/roomList/BSTedit', query: { type:type} });
+        case 3: this.$router.push({ path: '/cms/leadMatch/roomList/BSTedit', query: { type: type } });
           break
       }
     },
-    changeSize (e) {
+    changeSize(e) {
       this.pageSize = e;
-        if (localStorage.getItem("searchList")) {
-        this.initData(JSON.parse(localStorage.getItem("searchList")));
-      }else{
-        this.initData()
-      } 
+      this.pageIndex = 1;
+      this.initData(this.proxyData)
+
     },
-     changePage (e) {
+    changePage(e) {
       this.pageIndex = e;
-        if (localStorage.getItem("searchList")) {
-        this.initData(JSON.parse(localStorage.getItem("searchList")));
-      }else{
-        this.initData()
-      } 
+      this.initData(this.proxyData)
     },
   },
 };
 </script>
 <style scoped lang='scss'>
-.weight_memo_content{
-    height: 80%;
-    overflow: auto;
+.weight_memo_content {
+  height: 80%;
+  overflow: auto;
 }
-.content_body_page{
-    margin-top: 10px;
-    text-align: center;
+.content_body_page {
+  margin-top: 10px;
+  text-align: center;
 }
 </style>

src/views/leadMatch/weightMemo/BSTlist.vue

@@ -5,7 +5,7 @@
     </Toptitle>
     <div class="weight_memo_content">
       <div>
-        <Topsearch :list="list" @init="initData" @searchData="searchData" />
+        <Topsearch :list="list" @searchData="searchData" />
       </div>
       <div
         style="
@@ -15,27 +15,33 @@
           padding-top: 10px;
         "
       >
-        <Button type="primary" size="small" style="margin-right: 10px" @click="gotoPage(3)"
+        <Button
+          type="primary"
+          size="small"
+          style="margin-right: 10px"
+          @click="gotoPage(3)"
           >新增</Button
         >
       </div>
       <Table :columns="tableColumns" border :data="tableData">
-        <template slot="make_data" slot-scope="{row}">
-          <span>{{func.replaceDateNoHMS(row.crt_time)}}</span>
+        <template slot="make_data" slot-scope="{ row }">
+          <span>{{ func.replaceDateNoHMS(row.crt_time) }}</span>
         </template>
-     </Table>
+      </Table>
+    </div>
+    <div class="content_body_page">
+      <Page
+        :page-size-opts="[10, 20, 30, 40, 100]"
+        @on-page-size-change="changeSize"
+        @on-change="changePage"
+        :current="pageIndex"
+        show-total
+        show-elevator
+        :total="total"
+        show-sizer
+        :page-size="pageSize"
+      />
     </div>
-      <div class="content_body_page">
-          <Page :page-size-opts="[10, 20, 30, 40,100]"
-                @on-page-size-change='changeSize'
-                @on-change='changePage'
-                :current='pageIndex'
-                show-total
-                show-elevator
-                :total="total"
-                show-sizer
-                :page-size='pageSize' />
-        </div>
   </div>
 </template>
 <script>
@@ -78,127 +84,133 @@ export default {
         // },
       ],
       tableColumns: [
-        { title: "项目编码", key: "project_number", align: "center" , resizable: true,
-                        width: 350},
-        { title: "项目名称", key: "project_name", align: "center",  resizable: true,
-                        width: 350 },
-        { title: "项目简称", key: "abbreviation", align: "center", resizable: true,
-                        width: 350},
+        {
+          title: "项目编码", key: "project_number", align: "center", resizable: true,
+          width: 350
+        },
+        {
+          title: "项目名称", key: "project_name", align: "center", resizable: true,
+          width: 350
+        },
+        {
+          title: "项目简称", key: "abbreviation", align: "center", resizable: true,
+          width: 350
+        },
         // { title: "匹配状态", key: "state", align: "center", minWidth: 140,
         // render:(h,params)=>{
         //   return h('span',{},params.row.state===0?'未匹配':params.row.state===2?'匹配完成':'匹配中')
         // }},
-        { title: "制单日期", key: "make_data", align: "center",  resizable: true,
-                        width: 350,slot:"make_data"},
-        { title: "操作", key:'',align: "center", minWidth:150,
-         render: (h, params) => {
-                            return h('div', [
-                                h('a', { style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.gotoPage(1,params.row)
-                                        }
-                                    }
-                                    }, '编辑'),
-                                h('a', { style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.gotoPage(2,params.row)
-                                        }
-                                    }
-                                    }, '查看'),
-                                h('a',{ style: {
-                                        marginRight: '5px'
-                                    }, on: {
-                                        click: () => {
-                                            this.del(params.row)
-                                        }
-                                    }},'删除')
-                            ]);
-                        }},
+        {
+          title: "制单日期", key: "make_data", align: "center", resizable: true,
+          width: 350, slot: "make_data"
+        },
+        {
+          title: "操作", key: '', align: "center", minWidth: 150,
+          render: (h, params) => {
+            return h('div', [
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.gotoPage(1, params.row)
+                  }
+                }
+              }, '编辑'),
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.gotoPage(2, params.row)
+                  }
+                }
+              }, '查看'),
+              h('a', {
+                style: {
+                  marginRight: '5px'
+                }, on: {
+                  click: () => {
+                    this.del(params.row)
+                  }
+                }
+              }, '删除')
+            ]);
+          }
+        },
       ],
       tableData: [],
-      pageIndex: JSON.parse(localStorage.getItem("pageIndex")) || 1,
-      pageSize: JSON.parse(localStorage.getItem("pageSize")) || 10,
+      pageIndex: 1,
+      pageSize: 10,
       total: 0,
+      proxyData: {},
     };
   },
+  mounted() {
+    this.initData();
+  },
   methods: {
-    searchData(){
+    searchData(row) {
       this.pageIndex = 1;
       this.pageSize = 10;
-      let row = {};
-      this.list.forEach((e) => {
-        if (e.serverName == "project_number") {
-          this.$set(row, "project_number", e.value);
-        }
-        if (e.serverName == "project_name") {
-          this.$set(row, "project_name", e.value);
-        }
-        if (e.serverName == "abbreviation") {
-          this.$set(row, "abbreviation", e.value);
-        }
-        // this.$set(对象, key, 数组);
-      });
-      localStorage.setItem("searchList", JSON.stringify(row));
+      this.proxyData = JSON.parse(JSON.stringify(row));
       this.initData(row);
     },
     initData(row) {
-      this.axios.get('/api/cut_order_list',{params:{
-        page_index:this.pageIndex,page_size:this.pageSize,
-        order_type:1,
-        ...row}}).then(res=>{
+      this.axios.get('/api/cut_order_list', {
+        params: {
+          page_index: this.pageIndex, page_size: this.pageSize,
+          order_type: 1,
+          ...row
+        }
+      }).then(res => {
         this.tableData = res.data.data;
         this.total = res.data.total
       })
     },
-    del(row){
+    del(row) {
       this.confirmDelete({
-                content:'是否删除？',
-                title:'码单删除',
-                type:'primary',
-                then:()=>{
-                       this.axios.post('/api/cut_order_delete',{cut_order_id:row.id,order_type:1}).then(()=>{
-            this.initData()
+        content: '是否删除？',
+        title: '码单删除',
+        type: 'primary',
+        then: () => {
+          this.axios.post('/api/cut_order_delete', { cut_order_id: row.id, order_type: 1 }).then(() => {
+            this.initData(this.proxyData);
           })
-                },
-                cancel:()=>{}
-            })
-       
+        },
+        cancel: () => { }
+      })
+
     },
-    gotoPage(type,row){
-      localStorage.setItem("list", JSON.stringify(this.list));
-      localStorage.setItem("pageSize", this.pageSize);
-      localStorage.setItem("pageIndex", this.pageIndex);
+    gotoPage(type, row) {
       //1 编辑 2 查看 3 新增
-      switch(type){
+      switch (type) {
         case 1:
-          case 2:this.$router.push({ path: '/cms/leadMatch/weightMemo/BSTedit', query: { type:type,cut_order_id:row.id} });
+        case 2: this.$router.push({ path: '/cms/leadMatch/weightMemo/BSTedit', query: { type: type, cut_order_id: row.id } });
           break
-          case 3:this.$router.push({ path: '/cms/leadMatch/weightMemo/BSTedit', query: { type:type} });
+        case 3: this.$router.push({ path: '/cms/leadMatch/weightMemo/BSTedit', query: { type: type } });
           break
       }
     },
-    changeSize (e) {
+    changeSize(e) {
       this.pageSize = e;
-      this.initData()
+      this.pageIndex = 1;
+      this.initData(this.proxyData);
     },
-     changePage (e) {
+    changePage(e) {
       this.pageIndex = e;
-      this.initData()
+      this.initData(this.proxyData);
     },
   },
 };
 </script>
 <style scoped lang='scss'>
-.weight_memo_content{
-    height: 80%;
-    overflow: auto;
+.weight_memo_content {
+  height: 80%;
+  overflow: auto;
 }
-.content_body_page{
-    margin-top: 10px;
-    text-align: center;
+.content_body_page {
+  margin-top: 10px;
+  text-align: center;
 }
 </style>

vue.config.js

@@ -1,12 +1,12 @@
 const axios_default_ip =
   process.env.NODE_ENV == "dev"
-    ? "http://124.71.176.88:70"
+    ? "http://hxyapi.qingyaokeji.com"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://124.71.176.88:70" //
-    : process.env.NODE_ENV == "prd_other"
-    ? "http://121.37.173.82:82" //贝斯特
-    : "http://124.71.176.88:882";
-    //http://hxy_api.qingyaokeji.com // 华信源
+      ? "http://hxyapi.qingyaokeji.com" //
+      : process.env.NODE_ENV == "prd_other"
+        ? "http://121.37.173.82:82" //贝斯特
+        : "http://124.71.176.88:882";
+//http://hxy_api.qingyaokeji.com // 华信源
 //  http://124.71.176.88:882  //江山
 // 'http://121.41.102.225:82' :测试
 // http://124.71.176.88:70  下沙新地址