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

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java

@@ -250,6 +250,16 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
             }
 
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getBusinessType())){
+                businessOrderNum++;
+
+                String value = businessOrderPagination.getBusinessType() instanceof List ?
+                        JsonUtil.getObjectToString(businessOrderPagination.getBusinessType()) :
+                        String.valueOf(businessOrderPagination.getBusinessType());
+                businessOrderQueryWrapper.lambda().eq(BusinessOrderEntity::getBusinessType,value);
+
+            }
+
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getCreateOrderDate())){
             businessOrderNum++;
 
@@ -495,7 +505,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
         if(isSave){
             String mainId = id ;
-        entity.setCode(generaterSwapUtil.getBillNumber("cgdj", false));
+        entity.setCode(generaterSwapUtil.getBillNumber("ssdj", false));
         entity.setCreateOrderDate(DateUtil.getNowDate());
             entity.setId(mainId);
             entity.setFlowId(businessOrderForm.getFlowId());

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java

@@ -95,4 +95,7 @@ public class BusinessOrderForm  {
     /** 状态 **/
     @JsonProperty("status")
     private Object status;
+    /** 采购/销售区分 */
+    @JsonProperty("businessType")
+    private Object businessType;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java

@@ -45,4 +45,7 @@ public class BusinessOrderPagination extends Pagination {
     /** 状态 */
     @JsonProperty("status")
     private Object status;
+    /** 采购/销售区分 */
+    @JsonProperty("businessType")
+    private Object businessType;
 }

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

@@ -0,0 +1,838 @@
+<template>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+            :disabled='continueBtnLoading'> 保 存</el-button>
+          <el-button @click="goBack"> 取 消</el-button>
+        </div>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="基础信息" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="发货仓库" prop="deliveryWarehouse">
+                <JnpfInput v-model="dataForm.deliveryWarehouse"
+                  @change="changeData('deliveryWarehouse',-1)" placeholder="请输入" disabled clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="12">
+              <jnpf-form-tip-item label="发货地址" prop="deliveryAddress">
+                <JnpfInput v-model="dataForm.deliveryAddress"
+                  @change="changeData('deliveryAddress',-1)" placeholder="请输入" disabled clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="订单信息" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.businessordervoucherrelationalList" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column label="单据编号" prop="orderId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>单据编号
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.orderId"
+                        @change="changeData('businessordervoucherrelational-orderId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="客户名称" prop="voucherId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>客户名称
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.voucherId"
+                        @change="changeData('businessordervoucherrelational-voucherId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="发货仓库" prop="orderType">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>发货仓库
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.orderType"
+                        @change="changeData('businessordervoucherrelational-orderType',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="紧急程度" prop="cargoAreaId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>紧急程度
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfSelect v-model="scope.row.cargoAreaId"
+                        @change="changeData('businessordervoucherrelational-cargoAreaId',scope.$index)"
+                        placeholder="请选择" clearable :style='{"width":"100%"}'
+                        :options="businessordervoucherrelationalcargoAreaIdOptions"
+                        :props="businessordervoucherrelationalcargoAreaIdProps">
+                      </JnpfSelect>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="订货时间" prop="creatorTime">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>订货时间
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfDatePicker v-model="scope.row.creatorTime"
+                        @change="changeData('businessordervoucherrelational-creatorTime',scope.$index)"
+                        :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                        placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                        format="yyyy-MM-dd">
+                      </JnpfDatePicker>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="期望发货时间" prop="lastModifyTime">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>期望发货时间
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfDatePicker v-model="scope.row.lastModifyTime"
+                        @change="changeData('businessordervoucherrelational-lastModifyTime',scope.$index)"
+                        :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                        placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                        format="yyyy-MM-dd">
+                      </JnpfDatePicker>
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="期望送达时间" prop="deleteTime">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>期望送达时间
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfDatePicker v-model="scope.row.deleteTime"
+                        @change="changeData('businessordervoucherrelational-deleteTime',scope.$index)"
+                        :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
+                        placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                        format="yyyy-MM-dd">
+                      </JnpfDatePicker>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                        @click="delbusinessordervoucherrelationalList(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="table-actions" @click="addbusinessordervoucherrelationalList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item>
+                <JnpfGroupTitle content="商品信息" contentPosition="left">
+                </JnpfGroupTitle>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label-width="0">
+                <div class="JNPF-common-title">
+                  <h2></h2>
+                </div>
+                <el-table :data="dataForm.businessorderproductrelationalList" size='mini'>
+                  <el-table-column type="index" width="50" label="序号" align="center" />
+                  <el-table-column label="商品名称" prop="productId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>商品名称
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.productId"
+                        @change="changeData('businessorderproductrelational-productId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="仓库名称" prop="businessOrderId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>仓库名称
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.businessOrderId"
+                        @change="changeData('businessorderproductrelational-businessOrderId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="规格" prop="spec">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>规格
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.spec"
+                        @change="changeData('businessorderproductrelational-spec',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="库存单位" prop="unitId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>库存单位
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.unitId"
+                        @change="changeData('businessorderproductrelational-unitId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="销售单位" prop="salesMainUnitId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>销售单位
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.salesMainUnitId"
+                        @change="changeData('businessorderproductrelational-salesMainUnitId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="实物库存" prop="realBound">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>实物库存
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.realBound"
+                        @change="changeData('businessorderproductrelational-realBound',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="可用库存" prop="useBound">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>可用库存
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.useBound"
+                        @change="changeData('businessorderproductrelational-useBound',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="在途库存" prop="creatorTime">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>在途库存
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.creatorTime"
+                        @change="changeData('businessorderproductrelational-creatorTime',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="其他仓库库存" prop="creatorUserId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>其他仓库库存
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.creatorUserId"
+                        @change="changeData('businessorderproductrelational-creatorUserId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="销售单价" prop="businessPrice">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>销售单价
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.businessPrice"
+                        @change="changeData('businessorderproductrelational-businessPrice',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="销售数量" prop="businessNum">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>销售数量
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.businessNum"
+                        @change="changeData('businessorderproductrelational-businessNum',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="检查结果" prop="lastModifyUserId">
+                    <template slot="header" v-if="false">
+                      <span class="required-sign">*</span>检查结果
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.lastModifyUserId"
+                        @change="changeData('businessorderproductrelational-lastModifyUserId',scope.$index)"
+                        placeholder="请输入" clearable :style='{"width":"100%"}'>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作" width="50">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                        @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="table-actions" @click="addbusinessorderproductrelationalList()">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
+    </div>
+  </transition>
+</template>
+
+
+<script>
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+        businessordervoucherrelationalList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+        businessorderproductrelationalList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+        businessordervoucherrelationalList: {
+          orderId: '',
+          orderIdOptions: [],
+          voucherId: '',
+          voucherIdOptions: [],
+          orderType: '',
+          orderTypeOptions: [],
+          cargoAreaIdOptions: [],
+          creatorTime: '',
+          creatorTimeOptions: [],
+          lastModifyTime: '',
+          lastModifyTimeOptions: [],
+          deleteTime: '',
+          deleteTimeOptions: [],
+          enabledmark: undefined
+        },
+        businessorderproductrelationalList: {
+          productId: '',
+          productIdOptions: [],
+          businessOrderId: '',
+          businessOrderIdOptions: [],
+          spec: '',
+          specOptions: [],
+          unitId: '',
+          unitIdOptions: [],
+          salesMainUnitId: '',
+          salesMainUnitIdOptions: [],
+          realBound: '',
+          realBoundOptions: [],
+          useBound: '',
+          useBoundOptions: [],
+          creatorTime: '',
+          creatorTimeOptions: [],
+          creatorUserId: '',
+          creatorUserIdOptions: [],
+          businessPrice: '',
+          businessPriceOptions: [],
+          businessNum: '',
+          businessNumOptions: [],
+          lastModifyUserId: '',
+          lastModifyUserIdOptions: [],
+          enabledmark: undefined
+        },
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        deliveryWarehouse: undefined,
+        deliveryAddress: undefined,
+        businessordervoucherrelationalList: [],
+        businessorderproductrelationalList: [],
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+      },
+      businessordervoucherrelationalcargoAreaIdOptions: [{ "fullName": "普通订单", "id": "1" }, { "fullName": "紧急订单", "id": "2" }],
+      businessordervoucherrelationalcargoAreaIdProps: { "label": "fullName", "value": "id" },
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        deliveryWarehouse: [],
+        deliveryAddress: [],
+        businessordervoucherrelationalorderId: [],
+        businessordervoucherrelationalvoucherId: [],
+        businessordervoucherrelationalorderType: [],
+        businessordervoucherrelationalcargoAreaId: [],
+        businessordervoucherrelationalcreatorTime: [],
+        businessordervoucherrelationallastModifyTime: [],
+        businessordervoucherrelationaldeleteTime: [],
+        businessorderproductrelationalproductId: [],
+        businessorderproductrelationalbusinessOrderId: [],
+        businessorderproductrelationalspec: [],
+        businessorderproductrelationalunitId: [],
+        businessorderproductrelationalsalesMainUnitId: [],
+        businessorderproductrelationalrealBound: [],
+        businessorderproductrelationaluseBound: [],
+        businessorderproductrelationalcreatorTime: [],
+        businessorderproductrelationalcreatorUserId: [],
+        businessorderproductrelationalbusinessPrice: [],
+        businessorderproductrelationalbusinessNum: [],
+        businessorderproductrelationallastModifyUserId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/BusinessOrder/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+    },
+    businessordervoucherrelationalExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.businessordervoucherrelationalList.length; i++) {
+        const e = this.dataForm.businessordervoucherrelationalList[i];
+      }
+      return isOk;
+    },
+    businessorderproductrelationalExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.businessorderproductrelationalList.length; i++) {
+        const e = this.dataForm.businessorderproductrelationalList[i];
+      }
+      return isOk;
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/BusinessOrder/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          if (!this.businessordervoucherrelationalExist()) return
+          if (!this.businessorderproductrelationalExist()) return
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/BusinessOrder',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/BusinessOrder/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    addbusinessordervoucherrelationalList() {
+      let item = {
+        orderId: undefined,
+        voucherId: undefined,
+        orderType: undefined,
+        cargoAreaId: '',
+        creatorTime: undefined,
+        lastModifyTime: undefined,
+        deleteTime: undefined,
+      }
+      this.getbusinessordervoucherrelationalList(item)
+    },
+    delbusinessordervoucherrelationalList(index) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.businessordervoucherrelationalList.splice(index, 1);
+      }).catch(() => {
+      });
+    },
+    getbusinessordervoucherrelationalList(value) {
+      let item = { ...this.tableRows.businessordervoucherrelationalList, ...value }
+      this.dataForm.businessordervoucherrelationalList.push(item)
+      this.childIndex = this.dataForm.businessordervoucherrelationalList.length - 1
+      this.isEdit = true
+      this.isEdit = false
+      this.childIndex = -1
+    },
+    addbusinessorderproductrelationalList() {
+      let item = {
+        productId: undefined,
+        businessOrderId: undefined,
+        spec: undefined,
+        unitId: undefined,
+        salesMainUnitId: undefined,
+        realBound: undefined,
+        useBound: undefined,
+        creatorTime: undefined,
+        creatorUserId: undefined,
+        businessPrice: undefined,
+        businessNum: undefined,
+        lastModifyUserId: undefined,
+      }
+      this.getbusinessorderproductrelationalList(item)
+    },
+    delbusinessorderproductrelationalList(index) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.dataForm.businessorderproductrelationalList.splice(index, 1);
+      }).catch(() => {
+      });
+    },
+    getbusinessorderproductrelationalList(value) {
+      let item = { ...this.tableRows.businessorderproductrelationalList, ...value }
+      this.dataForm.businessorderproductrelationalList.push(item)
+      this.childIndex = this.dataForm.businessorderproductrelationalList.length - 1
+      this.isEdit = true
+      this.isEdit = false
+      this.childIndex = -1
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      for (let i = 0; i < _dataAll.businessordervoucherrelationalList.length; i++) {
+        this.childIndex = i
+      }
+      for (let i = 0; i < _dataAll.businessorderproductrelationalList.length; i++) {
+        this.childIndex = i
+      }
+      this.childIndex = -1
+    },
+  },
+}
+
+</script>

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

@@ -455,17 +455,17 @@
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('settlementinfoList')">
+                <!-- <el-table-column label="操作" width="50" v-if="!judgeWrite('settlementinfoList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="delsettlementinfoList(scope.$index)">删除</el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
-              <div class="table-actions" @click="addsettlementinfoList()"
+              <!-- <div class="table-actions" @click="addsettlementinfoList()"
                 v-if="!judgeWrite('settlementinfoList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              </div> -->
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
@@ -710,14 +710,14 @@
               </div>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="24" v-if="judgeShow('status')">
+          <!-- <el-col :span="24" v-if="judgeShow('status')">
             <jnpf-form-tip-item label="状态" v-if="judgeShow('status')" prop="status">
               <JnpfSelect v-model="dataForm.status" @change="changeData('status',-1)"
                 placeholder="请选择" :disabled="judgeWrite('status')" clearable
                 :style='{"width":"100%"}' :options="statusOptions" :props="statusProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
-          </el-col>
+          </el-col> -->
           <!-- 表单结束 -->
         </template>
         <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
@@ -847,6 +847,7 @@ export default {
         settlementInfoList: [],
         businessOrderProductRelationalList: [],
         version: 0,
+        businessType: "2",
       },
       tableRequiredData: {},
       dataRule:

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

@@ -210,6 +210,7 @@ export default {
         createOrderDate: undefined,
         deliveryType: undefined,
         status: undefined,
+        businessType: "2",
       },
       treeProps: {
         children: 'children',