Merge branch 'hw' of 121.41.102.225:Nidong/jiufang

src/components/selects/reference/index.vue

@@ -1197,7 +1197,24 @@ export default {
         return this.$Message.warning('请选择物料')
       }
       if(this.type==1){
-        // console.log(this.tableResult,1111);
+       
+        let supplyTitle=[];
+        
+this.OutTableData.forEach(v=>{
+  if(v.supply_title){
+     supplyTitle.push(v.supply_title)
+  }
+         
+        })
+
+        if(this.tableResult.every(b=>(supplyTitle.indexOf(b.supply_title)!=-1))){
+
+        }else{
+          if(supplyTitle.length!=0){
+            return this.$Message.warning('供应商名称不一致，无法合并生成采购订单！！')
+          }
+          
+        }
         if(this.tableResult.every(val=>(val.supply_title===this.tableResult[0].supply_title))){
           
         }else{

src/routerMap/index.js

@@ -2169,6 +2169,42 @@ const routerMap = [
       require(["@/views/BasicSettings/printStyle"], resolve),
   },
   {
+    path: "/cms/PackagingStatistics/list",
+    name: "PackagingStatisticsList", //包装统计表
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/PackagingStatistics/list"], resolve),
+  },
+  {
+    path: "/cms/PackagingStatistics/detail",
+    name: "PackagingStatisticsDetail", //包装统计表-->详情
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/PackagingStatistics/detail"], resolve),
+  },
+  {
+    path: "/cms/PackagingStatistics/confirm",
+    name: "PackagingStatisticsConfirm", //包装统计表-->详情-->详情
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/PackagingStatistics/confirm"], resolve),
+  },
+  {
+    path: "/cms/PackagingStatistics/urlNumberDetail",
+    name: "PackagingStatisticsUrlNumberDetail", //包装统计表-->图号详情
+    meta: {
+      index: 3,
+    },
+    component: (resolve) =>
+      require(["@/views/PackagingStatistics/urlNumberDetail"], resolve),
+  },
+  {
     path: "/cms/Agreement/list",
     name: "AgreementList", //合同-->合同列表
     meta: {

src/views/PackagingStatistics/list.vue

@@ -0,0 +1,5 @@
+<template>
+    <div>
+        <Toptitle title="包装统计表"></Toptitle>
+    </div>
+</template>

src/views/ProductionOrderList/ProductionsOrder/BST_Decorationlist.vue

@@ -17,9 +17,7 @@
       :total="total"
     >
       <div slot="titleButton">
-        <Button @click="back" type="primary" ghost style="margin-right: 30px"
-          >返回</Button
-        >
+        <Button type="primary" @click="handleTotalPost"  style="margin-right: 30px">一键下排产</Button>
          <Dropdown trigger="click" transfer style="margin-right: 30px;
     border: 1px solid rgb(45, 140, 240);
     width: 75px;
@@ -73,6 +71,9 @@
           >批量下生产排产</Button
         >
         <Button type="primary" ghost>批量打印订单</Button> -->
+         <Button @click="back" type="primary" ghost style="margin-right: 30px"
+          >返回</Button
+        >
       </div>
 
       <template slot="set" slot-scope="{ row }">
@@ -411,6 +412,7 @@ export default {
   },
   data() {
     return {
+      unPrId:[],
       options:{},
       finishData:[],
       basics_procedure_list:[],
@@ -995,6 +997,9 @@ export default {
     });
   },
   methods: {
+    handleTotalPost(){
+        this.openModal(null,1);
+    },
     timeFocus(e,row){
       if(e){
           let ids = [];
@@ -1018,6 +1023,7 @@ export default {
       }
     },
     finishDataTrue(){
+      console.log(this.planInfo.pr_id);
       let arr = [];
       this.basics_procedure_list.forEach(m=>{
        let obj = {};
@@ -1130,6 +1136,9 @@ switch(e){
           this.list[3].option = res.data.number_detail;
           this.list[4].option = res.data.part;
           this.list[9].option = res.data.img_number;
+          this.axios.post('/api/batch_orders_plan',{...row}).then(res=>{
+            this.unPrId = res.data;
+          })
         }
       );
     },
@@ -1200,7 +1209,7 @@ switch(e){
     back() {
       this.$router.go(-1);
     },
-    openModal(row) {
+    openModal(row,type) {
       if (Array.isArray(row)) {
         //批量下生产操作
         if (row.length < 1) {
@@ -1239,8 +1248,14 @@ switch(e){
         row.map((v) => result.push(v.pr_id));
         this.planInfo.pr_id = result;
       } else {
-        //单个下生产
-        this.planInfo.pr_id = [row.pr_id];
+        
+        if(type){
+//一键下生产
+  this.planInfo.pr_id = this.unPrId; 
+        }else{
+ //单个下生产
+ this.planInfo.pr_id = [row.pr_id];
+        }
       }
        this.axios.get('/api/basics_procedure_index').then(res=>{
          this.basics_procedure_list = res.data.data.filter(v=>{

src/views/Warehouse/Warehouse/inoutTotalList.vue

@@ -89,6 +89,7 @@
       <Table :columns="tableColums"
              :data="tableData"
              border
+             max-height='500'
              :span-method="handleSpan">
       </Table>
       <div class="pageSlotStyle">
@@ -131,7 +132,7 @@ export default {
           title: '规格型号', align: 'center', key: 'renovation_type', minWidth: 180,
           render: (h, params) => {
             const { row } = params
-            let text = `L${row.long?row.long:0}*W${row.width?row.width:0}*H${row.high?row.high:0}`
+            let text = `${row.long?row.long:0}*${row.width?row.width:0}*${row.high?row.high:0}`
             return  row.warehouse_title=='合计'?h('span', {}, ''):h('span',{},text)
           }
         },

src/views/Warehouse/Warehouse/stockingTable.vue

@@ -84,7 +84,7 @@
                           title="单据日期"
                           min-width="122">
           <template #default="{ row }">
-            {{ (row.crt_time*1)? func.replaceDate(row.crt_time+'') :row.crt_time}}
+            {{ (row.crt_time*1)? func.replaceDateNoHMS(row.crt_time+'') :row.crt_time}}
           </template>
         </vxe-table-column>
         <vxe-table-column field="order_no"
@@ -406,7 +406,7 @@ export default {
         res.data.data.forEach(element => {
            element.before_num = element.remain_num;
            element.before_total_price = (element.remain_price*1).toFixed(2);
-           element.before_price = ((element.remain_price*1)/(element.remain_num*1)).toFixed(2);
+           element.before_price = element.remain_num*1?((element.remain_price*1)/(element.remain_num*1)).toFixed(2):'0.00';
            if(element.type==1||element.type==4){
              element.in_num = element.num;
              element.in_price = (element.price*1).toFixed(2);
@@ -421,11 +421,11 @@ export default {
              let obj = JSON.parse(JSON.stringify(element));
              element.in_num = obj.in_num;
                 element.in_total_price = (element.in_total_price).toFixed(2);
-             element.in_price = (obj.in_total_price*1/obj.in_num*1).toFixed(2);
+             element.in_price = obj.in_num*1?(obj.in_total_price*1/obj.in_num*1).toFixed(2):'0.00';
                element.out_num = obj.out_num;
                   element.out_total_price = (obj.out_total_price*1).toFixed(2);
 
-             element.out_price = ((obj.out_total_price*1)/(obj.out_num*1)).toFixed(2);
+             element.out_price = obj.out_num*1?((obj.out_total_price*1)/(obj.out_num*1)).toFixed(2):'0.00';
               element.before_num = '';
            element.before_total_price = '';
            element.before_price = '';

vue.config.js

@@ -2,7 +2,7 @@ const axios_default_ip =
   process.env.NODE_ENV == "dev"
     ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://121.41.102.225:82" //
+    ? "http://124.71.176.88:882" //
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";