Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue

@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -248,6 +241,7 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      returnCargoFlowList: [],
       exportBoxVisible: false,
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
@@ -287,6 +281,15 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760963842336051202").then(res1 => {
+      let returnCargoFlowId = res1.data && res1.data.id
+      getFlowList(returnCargoFlowId, '1').then(res2 => {
+        this.returnCargoFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createReturnCargoOrder() {
@@ -298,15 +301,27 @@ export default {
         })
         return
       }
-      // const data = this.multipleSelectionItem
+      const selectData = this.multipleSelectionItem
-      // this.saleOrderVisible = true
+      if (!this.returnCargoFlowList.length) {
-      // this.$nextTick(() => {
+        this.$message({ type: 'error', message: '流程不存在' });
-      //   this.$refs.SaleOrder.init(data)
+      } else if (this.returnCargoFlowList.length === 1) {
-      // })
+        this.selectFlow1(this.returnCargoFlowList[0], selectData)
-      this.$message({
+      } else {
-        type: 'error',
+        this.flowListVisible = true
-        message: '暂未开放',
+      }
-        duration: 1500,
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue

@@ -226,7 +226,6 @@
       @close="toFormDetailVisible = false" />
     <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
       @superQuery="superQuery" />
-    <SaleOrder v-if="saleOrderVisible" ref="SaleOrder" @refresh="initData" />
     <SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
   </div>
 </template>
@@ -250,14 +249,13 @@ import columnList from './columnList'
 import { thousandsFormat } from "@/components/Generator/utils/index"
 import SuperQuery from '@/components/SuperQuery'
 import superQueryJson from './superQueryJson'
-import SaleOrder from '@/views/scm/saleCenter/saleOrder/form.vue'
 
 
 export default {
   components: {
     FlowBox,
     SaleFlowBox,
-    ExportBox, ToFormDetail, SuperQuery, SaleOrder
+    ExportBox, ToFormDetail, SuperQuery
   },
   data() {
 
@@ -391,26 +389,6 @@ export default {
     })
   },
   methods: {
-    createSaleOrder() {
-      if (!this.multipleSelectionItem.length) {
-        this.$message({
-          type: 'error',
-          message: '请选择一条数据',
-          duration: 1500,
-        })
-        return
-      }
-      const data = this.multipleSelectionItem
-      this.saleOrderVisible = true
-      this.$nextTick(() => {
-        this.$refs.SaleOrder.init(data)
-      })
-      // this.$message({
-      //   type: 'error',
-      //   message: '暂未开放',
-      //   duration: 1500,
-      // })
-    },
     toDetail(defaultValue, modelId) {
       if (!defaultValue) return
       getConfigData(modelId).then(res => {
@@ -696,7 +674,7 @@ export default {
         this.jnpf.downloadFile(res.data.url)
         this.$refs.ExportBox.visible = false
         this.exportBoxVisible = false
-      })
+      })    
     },
     search() {
       this.listQuery.currentPage = 1
@@ -710,7 +688,7 @@ export default {
       let data = {
         id: row.id,
         flowId: row.flowId || this.flowList[0].id,
-        opType: flowState ? 0 : '-1',
+        opType: flowState ? 0 : '-1', 
         status: flowState
       }
       this.flowVisible = true

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue

@@ -207,6 +207,7 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      deliveryFlowList: [],
       exportBoxVisible: false,
       receiptTypeOptions: [{ "fullName": "采购收货", "id": "1" }],
       receiptTypeProps: { "label": "fullName", "value": "id" },
@@ -253,6 +254,15 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760911763504566273").then(res1 => {
+      let deliveryFlowId = res1.data && res1.data.id
+      getFlowList(deliveryFlowId, '1').then(res2 => {
+        this.deliveryFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createDeliveryOrder() {
@@ -264,15 +274,27 @@ export default {
         })
         return
       }
-      // const data = this.multipleSelectionItem
+      const selectData = this.multipleSelectionItem
-      // this.saleOrderVisible = true
+      if (!this.deliveryFlowList.length) {
-      // this.$nextTick(() => {
+        this.$message({ type: 'error', message: '流程不存在' });
-      //   this.$refs.SaleOrder.init(data)
+      } else if (this.deliveryFlowList.length === 1) {
-      // })
+        this.selectFlow1(this.deliveryFlowList[0], selectData)
-      this.$message({
+      } else {
-        type: 'error',
+        this.flowListVisible = true
-        message: '暂未开放',
+      }
-        duration: 1500,
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue

@@ -1,10 +1,3 @@
-
-
-
-
-
-
-
 <template>
   <div class="JNPF-common-layout">
     <div class="JNPF-common-layout-center">
@@ -67,10 +60,10 @@
               @click="createPurchaseOrder()">生成采购单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="createPurchaseOrder()">生成收货单
+              @click="createReceiptOrder()">生成收货单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="createPurchaseOrder()">生成销售发货凭证
+              @click="createSaleDeliveryVoucher()">生成销售发货凭证
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -254,6 +247,9 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      purchaseFlowList: [],
+      receiptFlowList: [],
+      deliveryVoucherFlowList: [],
       exportBoxVisible: false,
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
@@ -293,6 +289,33 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760188153336909825").then(res1 => {
+      let purchaseFlowId = res1.data && res1.data.id
+      getFlowList(purchaseFlowId, '1').then(res2 => {
+        this.purchaseFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+    getFormById("1760939976058462210").then(res1 => {
+      let receiptFlowId = res1.data && res1.data.id
+      getFlowList(receiptFlowId, '1').then(res2 => {
+        this.receiptFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+    getFormById("523901091608268101").then(res1 => {
+      let deliveryVoucherFlowId = res1.data && res1.data.id
+      getFlowList(deliveryVoucherFlowId, '1').then(res2 => {
+        this.deliveryVoucherFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createPurchaseOrder() {
@@ -304,15 +327,63 @@ export default {
         })
         return
       }
-      // const data = this.multipleSelectionItem
+      const selectData = this.multipleSelectionItem
-      // this.saleOrderVisible = true
+      if (!this.purchaseFlowList.length) {
-      // this.$nextTick(() => {
+        this.$message({ type: 'error', message: '流程不存在' });
-      //   this.$refs.SaleOrder.init(data)
+      } else if (this.purchaseFlowList.length === 1) {
-      // })
+        this.selectFlow1(this.purchaseFlowList[0], selectData)
-      this.$message({
+      } else {
-        type: 'error',
+        this.flowListVisible = true
-        message: '暂未开放',
+      }
-        duration: 1500,
+    },
+    createReceiptOrder() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const selectData = this.multipleSelectionItem
+      if (!this.receiptFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.receiptFlowList.length === 1) {
+        this.selectFlow1(this.receiptFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    createSaleDeliveryVoucher() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const selectData = this.multipleSelectionItem
+      if (!this.deliveryVoucherFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.deliveryVoucherFlowList.length === 1) {
+        this.selectFlow1(this.deliveryVoucherFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue

@@ -60,10 +60,10 @@
               @click="createSaleOrder()">生成销售单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="createSaleOrder()">生成发货单
+              @click="createDeliveryOrder()">生成发货单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="createSaleOrder()">生成采购收货凭证
+              @click="createPurchaseReceiptVoucher()">生成采购收货凭证
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -255,6 +255,9 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      saleOrderFlowList: [],
+      deliveryOrderFlowList: [],
+      purchaseReceiptVoucherFlowList: [],
       exportBoxVisible: false,
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
@@ -294,6 +297,33 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("522690032352364805").then(res1 => {
+      let saleOrderFlowId = res1.data && res1.data.id
+      getFlowList(saleOrderFlowId, '1').then(res2 => {
+        this.saleOrderFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+    getFormById("530411417380062341").then(res1 => {
+      let deliveryOrderFlowId = res1.data && res1.data.id
+      getFlowList(deliveryOrderFlowId, '1').then(res2 => {
+        this.deliveryOrderFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+    getFormById("1760230311607619586").then(res1 => {
+      let purchaseReceiptVoucherFlowId = res1.data && res1.data.id
+      getFlowList(purchaseReceiptVoucherFlowId, '1').then(res2 => {
+        this.purchaseReceiptVoucherFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createSaleOrder() {
@@ -305,10 +335,63 @@ export default {
         })
         return
       }
-      this.$message({
+      const selectData = this.multipleSelectionItem
-        type: 'error',
+      if (!this.saleOrderFlowList.length) {
-        message: '暂未开放',
+        this.$message({ type: 'error', message: '流程不存在' });
-        duration: 1500,
+      } else if (this.saleOrderFlowList.length === 1) {
+        this.selectFlow1(this.saleOrderFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    createDeliveryOrder() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const selectData = this.multipleSelectionItem
+      if (!this.deliveryOrderFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.deliveryOrderFlowList.length === 1) {
+        this.selectFlow1(this.deliveryOrderFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    createPurchaseReceiptVoucher() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const selectData = this.multipleSelectionItem
+      if (!this.purchaseReceiptVoucherFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.purchaseReceiptVoucherFlowList.length === 1) {
+        this.selectFlow1(this.purchaseReceiptVoucherFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue

@@ -67,7 +67,7 @@
               @click="createPurchaseOrder()">生成采购单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
-              @click="createPurchaseOrder()">生成发货凭证
+              @click="createDeliveryVoucher()">生成发货凭证
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -251,6 +251,8 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      purchaseFlowList: [],
+      deliveryVoucherFlowList: [],
       exportBoxVisible: false,
       voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
       voucherTypeProps: { "label": "fullName", "value": "id" },
@@ -290,6 +292,24 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760188153336909825").then(res1 => {
+      let purchaseFlowId = res1.data && res1.data.id
+      getFlowList(purchaseFlowId, '1').then(res2 => {
+        this.purchaseFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
+    getFormById("523901091608268101").then(res1 => {
+      let deliveryVoucherFlowId = res1.data && res1.data.id
+      getFlowList(deliveryVoucherFlowId, '1').then(res2 => {
+        this.deliveryVoucherFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createPurchaseOrder() {
@@ -301,10 +321,45 @@ export default {
         })
         return
       }
-      this.$message({
+      const selectData = this.multipleSelectionItem
-        type: 'error',
+      if (!this.purchaseFlowList.length) {
-        message: '暂未开放',
+        this.$message({ type: 'error', message: '流程不存在' });
-        duration: 1500,
+      } else if (this.purchaseFlowList.length === 1) {
+        this.selectFlow1(this.purchaseFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    createDeliveryVoucher() {
+      if (!this.multipleSelectionItem.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
+        })
+        return
+      }
+      const selectData = this.multipleSelectionItem
+      if (!this.deliveryVoucherFlowList.length) {
+        this.$message({ type: 'error', message: '流程不存在' });
+      } else if (this.deliveryVoucherFlowList.length === 1) {
+        this.selectFlow1(this.deliveryVoucherFlowList[0], selectData)
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {

jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue

@@ -92,9 +92,8 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' hasC
           @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
-
           <el-table-column prop="code" label="单据编号" align="left" fixed="left">
           </el-table-column>
           <el-table-column prop="firstSubjectBasicId" label="客户名称" align="left" fixed="left">
@@ -271,6 +270,7 @@ export default {
       flowVisible: false,
       flowListVisible: false,
       flowList: [],
+      purchaseFlowList: [],
       exportBoxVisible: false,
       orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "合同销售", "id": "2" }],
       orderTypeProps: { "label": "fullName", "value": "id" },
@@ -337,6 +337,15 @@ export default {
         this.$router.push('/404');
       })
     })
+    getFormById("1760188153336909825").then(res1 => {
+      let purchaseFlowId = res1.data && res1.data.id
+      getFlowList(purchaseFlowId, '1').then(res2 => {
+        this.purchaseFlowList = res2.data
+      }).catch((e) => {
+        this.$message({ type: 'error', message: e.message });
+        this.$router.push('/404');
+      })
+    })
   },
   methods: {
     createPurchaseOrder() {
@@ -348,15 +357,27 @@ export default {
         })
         return
       }
-      // const data = this.multipleSelectionItem
+      const selectData = this.multipleSelectionItem
-      // this.saleOrderVisible = true
+      if (!this.purchaseFlowList.length) {
-      // this.$nextTick(() => {
+        this.$message({ type: 'error', message: '流程不存在' });
-      //   this.$refs.SaleOrder.init(data)
+      } else if (this.purchaseFlowList.length === 1) {
-      // })
+        this.selectFlow1(this.purchaseFlowList[0], selectData)
-      this.$message({
+      } else {
-        type: 'error',
+        this.flowListVisible = true
-        message: '暂未开放',
+      }
-        duration: 1500,
+    },
+    selectFlow1(item, selectData) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1',
+        selectData: selectData
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
       })
     },
     toDetail(defaultValue, modelId) {