Merge branch 'hw' of 121.41.102.225:Nidong/jiufang

src/components/footer/index.vue

@@ -3,7 +3,7 @@
         <div>
             <Page
             show-elevator
-            :page-size-opts="[10, 20, 30, 40,100,1000]" @on-page-size-change='changeSize' @on-change='changePage' :current='pageIndex' show-total :total="total" show-sizer :page-size='pageSize' />
+            :page-size-opts="[10, 20, 30, 40,100,1000,5000]" @on-page-size-change='changeSize' @on-change='changePage' :current='pageIndex' show-total :total="total" show-sizer :page-size='pageSize' />
         </div>
         
     </div>

src/components/selects/reference/index.vue

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

src/views/PayrollRequisition/edit.vue

@@ -322,6 +322,7 @@
 export default {
     data(){
          return{ 
+           routerState:true,
            tableState:'',
            tableIndex:'',
            tableUrl:[],
@@ -680,6 +681,11 @@ initData(){
      })
 },
         postData(){
+            if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
             let obj = JSON.parse(JSON.stringify(this.formData));
             obj.invoice_time = obj.invoice_time?Date.parse(obj.invoice_time).toString().slice(0,10):'';
              obj.payment_time = obj.payment_time?Date.parse(obj.payment_time).toString().slice(0,10):'';

src/views/PurchasingManage/ArrivalOrder/edit.vue

@@ -333,6 +333,7 @@ export default {
   data () {
     // 这里存放数据
     return {
+      routerState:true,
       fax_modify: '',
       searchData: {
         order_time:new Date().toLocaleString(),
@@ -846,6 +847,11 @@ export default {
         if(objData.length == 0){
          return this.$Message.warning('请选择物料')
         }
+          if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       let obj = JSON.parse(JSON.stringify(this.searchData))
       obj.order_time = new Date(obj.order_time).getTime() / 1000 || ''
       obj.arrive_time = new Date(obj.arrive_time).getTime() / 1000|| ''

src/views/PurchasingManage/InstockOrder/edit.vue

@@ -672,6 +672,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      routerState:true,
       shareFreightModal: false,
       shareFreightValue: "按数量分摊",
       other_price: "0.00",
@@ -2368,6 +2369,11 @@ export default {
       if (this.tableData.length == 1) {
         return this.$Message.warning("请选择物料！");
       }
+        if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       this.tableData.forEach((element) => {
         if (element.type != 0) {
           this.searchData.type = 1;

src/views/PurchasingManage/OutstockOrder/edit.vue

@@ -364,6 +364,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      routerState:true,
       modelSearchData:{
         order_in_no:'',
         start_time:'',
@@ -1250,12 +1251,18 @@ currentRow.total = (currentRow.num*currentRow.price*1).toFixed(2)
         .catch((err) => {});
     },
     postData() {
+      
       if(!this.searchData.type||!this.searchData.warehouse_id||!this.searchData.order_time){
         return this.$Message.warning('请先确认保存数据！')
       }
       if(this.tableData.length==1){
         return this.$Message.warning('物料不能为空！')
       }
+        if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       let state = false;
       this.tableData.forEach(v=>{
         if(v.reference_order_no=='参照'){

src/views/PurchasingManage/PurchasingOrder/edit.vue

@@ -550,6 +550,7 @@ export default {
   data () {
     // 这里存放数据
     return {
+      routerState:true,
       clickMaterial:{},
       delData:[],
       material_name:'',
@@ -1495,6 +1496,11 @@ if(this.selectChoose.length == 0){
       if(!this.searchData.supply_title&&!this.searchData.supply_id){
         return this.$Message.warning('请选择供应商')
       }
+        if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       let state = false;
      let copy_data =JSON.parse(JSON.stringify(this.tableData));
        copy_data.pop();
@@ -1545,11 +1551,12 @@ if(this.selectChoose.length == 0){
               obj.state =0
             };
            this.purchase_data.forEach(m=>{
-             if(v.material_detail_id = m[0].material_detail_id){
+             if(v.material_detail_id == m[0].material_detail_id){
                   obj.children=[...m]
                   obj.children.map(v=>{
                     v.num = v.purchases_num*1
                   })
+                  
              }
            })
            children.push(obj)
@@ -1618,6 +1625,7 @@ if(this.selectChoose.length == 0){
         OutTableData,
         title: '参照采购计划',
         then: (result, data) => {
+         
           result.forEach(element => {
             element.refer = true;
             element.num = 0
@@ -1733,6 +1741,7 @@ if(this.selectChoose.length == 0){
          }
        }
           this.tableData.unshift(...this.purchase_tableData)
+          console.log(this.tableData);
           // this.searchData.residential_name = result[0].residential_name
           // console.log(result)
         }

src/views/PurchasingManage/QualitycontrolOrder/edit.vue

@@ -313,6 +313,7 @@ export default {
   data () {
     // 这里存放数据
     return {
+      routerState:true,
       delData:[],
       warehouse:'',
       fax_modify: '',
@@ -721,6 +722,11 @@ export default {
       }).catch((err) => { });
     },
     postData () {
+        if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       let obj = JSON.parse(JSON.stringify(this.searchData))
       obj.order_time = parseInt(new Date(obj.order_time).getTime() / 1000) || ''
       this.tableData.forEach((v,index)=>{

src/views/PurchasingManage/extraCosts/edit.vue

@@ -344,7 +344,8 @@ export default {
      {title:'单价',align:'center',minWidth:100,key:'price'},
      {title:'金额',align:'center',minWidth:100,key:'total_price'},
      {title:'备注',align:'center',minWidth:100,key:'remark'},
- ]
+ ],
+ routerState:true
         }
     },
    created(){
@@ -539,6 +540,11 @@ export default {
             
         },
         postData(){
+            if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
             let obj =JSON.parse(JSON.stringify(this.formData));
             let arr = this.tableData.filter(v=>{
                 return v.name!='';

src/views/PurchasingManage/redFontInstockOrder/edit.vue

@@ -508,6 +508,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      routerState:true,
       delData: [],
       //   modelTaxRate:0,
       //   ChangeTaxRate:false,
@@ -1463,6 +1464,11 @@ export default {
       if (this.tableData.length == 0) {
         return this.$Message.warning("没有数据不能保存！");
       }
+        if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       //   this.tableData.forEach(element => {
       //     if (element.type != 0) {
       //       this.searchData.type = 1

src/views/PurchasingManage/redFontOutstockOrder/edit.vue

@@ -408,6 +408,7 @@ export default {
   data () {
     // 这里存放数据
     return {
+      routerState:true,
       delData:[],
     //   modelTaxRate:0,
     //   ChangeTaxRate:false,
@@ -1085,6 +1086,11 @@ export default {
     //       this.searchData.type = 0
     //     }
     //   });
+      if(!this.routerState){
+       return
+     }else{
+       this.routerState = false;
+     }
       let obj = JSON.parse(JSON.stringify(this.searchData))
       obj.type = obj.type_id;
       obj.order_time = parseInt(new Date(obj.order_time).getTime() / 1000) || ''