From 5be18e4463b95b5a782742cb8e7779ee21959c65 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Fri, 19 Apr 2024 17:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=92=8C=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/scm/VoucherMapper.xml    |   2 +
 .../impl/ProductWarehouseServiceImpl.java     |  19 +-
 .../ProductWarehousePagination.java           |   2 +
 .../scm/publicPopup/ProductByContractBox.vue  |   7 +-
 .../purchaseCenter/deliveryVoucher/form.vue   |   2 +-
 .../purchaseCenter/purchaseGuide/index.vue    |  46 +-
 .../scm/purchaseCenter/purchaseOrder/form.vue | 115 ++++-
 .../scm/purchaseCenter/receiptOrder/form.vue  |   5 +
 .../purchaseCenter/receiptVoucher/form.vue    |   2 +-
 .../scm/saleCenter/deliveryOrder/form.vue     |  67 ++-
 .../scm/saleCenter/deliveryVoucher/form.vue   |   4 +-
 .../scm/saleCenter/deliveryVoucher/index.vue  |  72 +--
 .../scm/saleCenter/receiptOrder/form.vue      | 353 ++++++--------
 .../scm/saleCenter/receiptVoucher/form.vue    |  14 +-
 .../scm/saleCenter/returnCargoOrder/form.vue  |  61 ++-
 .../views/scm/saleCenter/saleGuide/index.vue  | 449 ++++++++++++++++++
 .../scm/saleCenter/saleInBoundNotice/form.vue |  92 ++--
 .../views/scm/saleCenter/saleOrder/form.vue   | 313 +++++++++---
 18 files changed, 1147 insertions(+), 478 deletions(-)
 create mode 100644 jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleGuide/index.vue

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
index 0c492d6b..de6a5fb2 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
@@ -361,6 +361,8 @@
         d.tare_weight,
         d.buckle_weight,
         d.net_weight,
+        d.spec,
+        d.unit,
         e.vehicle_number
         FROM
         jg_voucher a
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
index 85e789e2..04a14699 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
@@ -2,6 +2,7 @@ package jnpf.service.impl;
 
 import jnpf.entity.*;
 import jnpf.mapper.ProductWarehouseMapper;
+import jnpf.mapper.SubjectproductblacklistMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.productwarehouse.*;
@@ -18,6 +19,8 @@ import java.util.regex.Pattern;
 import jnpf.model.QueryModel;
 import java.util.stream.Collectors;
 import jnpf.base.model.ColumnDataModel;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -57,6 +60,8 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
     private ProductWarehouseService productWarehouseService;
     @Resource
     private ProductWarehouseMapper productWarehouseMapper;
+    @Resource
+    private SubjectproductblacklistMapper subjectproductblacklistMapper;
     @Override
     public List<ProductWarehouseEntity> getList(ProductWarehousePagination productWarehousePagination){
         return getTypeList(productWarehousePagination,productWarehousePagination.getDataType());
@@ -751,17 +756,21 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
 
             }
 
-            if(ObjectUtil.isNotEmpty(productWarehousePagination.getProductTypeId())){
+            if(productWarehousePagination.getExcludeIdList() != null && productWarehousePagination.getExcludeIdList().size() > 0){
                 productWarehouseNum++;
 
-                productWarehouseQueryWrapper.lambda().eq(ProductWarehouseEntity::getProductTypeId,productWarehousePagination.getProductTypeId());
+                productWarehouseQueryWrapper.notIn("a.id",productWarehousePagination.getExcludeIdList());
 
             }
 
-            if(productWarehousePagination.getExcludeIdList() != null && productWarehousePagination.getExcludeIdList().size() > 0){
+            //判断是否要根据供应商/客户去除黑名单商品
+            if(StringUtils.isNotEmpty(productWarehousePagination.getSubjectId())){
                 productWarehouseNum++;
-
-                productWarehouseQueryWrapper.lambda().notIn(ProductWarehouseEntity::getId,productWarehousePagination.getExcludeIdList());
+                QueryWrapper<SubjectproductblacklistEntity> queryWrapper = new QueryWrapper<>();
+                queryWrapper.lambda().eq(SubjectproductblacklistEntity::getSubjectBasicId,productWarehousePagination.getSubjectId());
+                List<SubjectproductblacklistEntity> list = subjectproductblacklistMapper.selectList(queryWrapper);
+                List<String> productIdList = list.stream().map(SubjectproductblacklistEntity::getProductId).collect(Collectors.toList());
+                productWarehouseQueryWrapper.notIn(ObjectUtils.isNotEmpty(productIdList),"a.id",productIdList);
 
             }
 
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java
index beb10378..e58d9da1 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java
@@ -56,4 +56,6 @@ public class ProductWarehousePagination extends Pagination {
 
     @JsonProperty("cargoId")
     private Object cargoId;
+    @JsonProperty("subjectId")
+    private String subjectId;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductByContractBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductByContractBox.vue
index fd0fcfe8..9d16eddb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductByContractBox.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductByContractBox.vue
@@ -83,20 +83,25 @@ export default {
         sidx: "",
       },
       excludeIdList: [],
+      subjectId: '',
       checked: []
     }
   },
   methods: {
-    init(excludeIdList, val) {
+    init(excludeIdList, subjectId) {
       this.visible = true
       this.listLoading = true
       if (excludeIdList && excludeIdList instanceof Array) {
         this.excludeIdList = excludeIdList;
       }
+      if (subjectId && typeof (subjectId) === 'string') {
+        this.subjectId = subjectId
+      }
       let query = {
         ...this.listQuery,
         keyword: this.keyword,
         excludeIdList: this.excludeIdList,
+        subjectId: this.subjectId,
         dataType: 0,
       }
       request({
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
index 07547ab2..ef2d63f9 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
@@ -868,7 +868,7 @@ export default {
         voucherStatus: [],
         documentType: [],
         associatedDocumentNo: [],
-        voucherproductproductId: [],
+        voucherproductproductId: [{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "customerId", "required": "0" }],
         voucherproductspec: [],
         voucherproductunit: [],
         voucherproductgrossWeight: [],
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseGuide/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseGuide/index.vue
index b7fd22fb..07da2c75 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseGuide/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseGuide/index.vue
@@ -55,7 +55,7 @@
                 <el-col>
                   4、仓管员 根据
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/purchaseOrder')">入库通知单</span>
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationpurchase')">入库通知单</span>
                   和
                   <span style="cursor:pointer;color:#409eff;"
                     @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
@@ -121,19 +121,21 @@
                     @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
                   生成
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span></el-col>
+                    @click="fnGo('/scm/saleCenter/deliveryVoucher')">发货凭证</span></el-col>
                 <el-col>
                   6、采购员 根据 客户的
                   <span style="cursor:pointer;color:#409eff;"
                     @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
-                  生成 收货单 增加库存
+                  生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/receiptOrder')">收货单</span> 增加库存
                 </el-col>
-                <el-col>7、采购员 根据
+                <el-col>7、销售员 根据
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span>
+                    @click="fnGo('/	scm/saleCenter/deliveryVoucher')">发货凭证</span>
                   生成
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/deliveryOrder')">发货单</span>
+                    @click="fnGo('/scm/saleCenter/deliveryOrder')">发货单</span>
                   减少库存</el-col>
               </el-row>
             </div>
@@ -192,16 +194,16 @@
                   <span style="cursor:pointer;color:#409eff;"
                     @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span>，下发
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">出库通知单</span>
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationsale')">出库通知单</span>
                 </el-col>
                 <el-col>4、仓管员 根据
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">出库通知单</span>
-                  进行发货</el-col>
-                <el-col>5、仓管员 根据
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationsale')">出库通知单</span>
+                  和
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span> 新增
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span>
-                  验货出库 减少库存</el-col>
+                    @click="fnGo('/scm/warehousing/warehousingoutbound')">出库单</span> 增加库存</el-col>
               </el-row>
             </div>
           </el-col>
@@ -244,13 +246,25 @@
                   <span style="cursor:pointer;color:#409eff;"
                     @click="fnGo('/scm/saleCenter/returnCargoOrder')">销售退货订单</span> 提交
                   <span style="cursor:pointer;color:#409eff;"
-                    @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span></el-col>
+                    @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">采购退供单</span></el-col>
                 <el-col>3、供应商物流人员 收到货物后</el-col>
-                <el-col>4、采购员 根据 供应商的 收货凭证 生成 发货凭证</el-col>
+                <el-col>4、采购员 根据 供应商的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptVoucher')">收货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span></el-col>
                 <el-col>
-                  5、销售员 根据 供应商的 收货凭证 生成 收货单 增加库存
+                  5、销售员 根据 供应商的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptVoucher')">收货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptOrder')">收货单</span> 增加库存
                 </el-col>
-                <el-col>6、采购员 根据 发货凭证生成 发货单 减少库存</el-col>
+                <el-col>6、采购员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryOrder')">发货单</span> 减少库存</el-col>
               </el-row>
             </div>
           </el-col>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
index fa05fea5..6c609cd8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
@@ -666,7 +666,8 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.advanceRatio"
                       @change="changeData('settlementinfo-advanceRatio', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable addonAfter="%"
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -679,7 +680,8 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.accountPeriod"
                       @change="changeData('settlementinfo-accountPeriod', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable addonAfter="天"
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -690,12 +692,16 @@
                       v-if="judgeRequired('settlementinfoList-underpaymentMethod')">*</span>压款方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.underpaymentMethod"
+                    <!-- <JnpfSelect v-model="scope.row.underpaymentMethod"
                       @change="changeData('settlementinfo-underpaymentMethod', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfounderpaymentMethodOptions"
                       :props="settlementinfounderpaymentMethodProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.underpaymentMethod"
+                      @change="changeData('settlementinfoList-underpaymentMethod',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="保证金方式" v-if="judgeShow('settlementinfo-marginMethod')"
@@ -705,12 +711,16 @@
                       v-if="judgeRequired('settlementinfoList-marginMethod')">*</span>保证金方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.marginMethod"
+                    <!-- <JnpfSelect v-model="scope.row.marginMethod"
                       @change="changeData('settlementinfo-marginMethod', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfomarginMethodOptions"
                       :props="settlementinfomarginMethodProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.marginMethod"
+                      @change="changeData('settlementinfoList-marginMethod',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="逾期利率" v-if="judgeShow('settlementinfo-overdueInterestRate')"
@@ -720,12 +730,16 @@
                       v-if="judgeRequired('settlementinfoList-overdueInterestRate')">*</span>逾期利率
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.overdueInterestRate"
+                    <!-- <JnpfSelect v-model="scope.row.overdueInterestRate"
                       @change="changeData('settlementinfo-overdueInterestRate', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfooverdueInterestRateOptions"
                       :props="settlementinfooverdueInterestRateProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.overdueInterestRate"
+                      @change="changeData('settlementinfo-overdueInterestRate',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="申请压款金额/比例" v-if="judgeShow('settlementinfo-applyForUnderpaymentRatio')"
@@ -1145,7 +1159,7 @@ 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"
 import ProductByContractBox from '@/views/scm/publicPopup/ProductByContractBox'
-import BomProductGoodsBox from '@/views/scm/publicPopup/BomProductGoodsBox'
+import BomProductGoodsBox from '@/views/scm/publicPopup/ProductByContractBox'
 import OrderContractBox from '@/views/scm/publicPopup/OrderContractBox'
 export default {
   mixins: [comMixin],
@@ -1641,18 +1655,18 @@ export default {
     },
     choiceProduct() {
       this.BomgoodsBoxVisible = true
+      let subjectId = this.dataForm.firstSubjectBasicId
       let excludeIdList = [];
       for (let i = 0; i < this.dataForm.businessOrderProductRelationalList.length; i++) {
         excludeIdList.push(this.dataForm.businessOrderProductRelationalList[i].productId);
       }
       this.$nextTick(() => {
-        this.$refs.BomGoodsBox.init(excludeIdList)
+        this.$refs.BomGoodsBox.init(excludeIdList, subjectId)
       })
     },
     initProductList(list) {
       for (let i = 0; i < list.length; i++) {
         const e = list[i];
-        debugger
         let item = {
           productId: e.id,
           spec: e.spec,
@@ -1723,6 +1737,28 @@ export default {
       val2.subjectbasicEntityList[0].subjectBasicId = val2.subjectbasicEntityList[0].id
       val2.subjectbasicEntityList[0].businessType = '1'
       this.dataForm.settlementInfoList = val2.subjectbasicEntityList
+      const subjectInfo = val2.subjectbasicEntityList[0]
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
       val2.productByContractModelList.forEach(item => {
         item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6)  //采购不含税单价
         item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //采购不含税总价
@@ -1749,7 +1785,6 @@ export default {
       })
     },
     contractList(list) {
-      debugger
       let e = list
       this.dataForm.contractId = e.id
       this.dataForm.contractName = e.contractName
@@ -1769,6 +1804,28 @@ export default {
       e.subjectbasicEntityList[0].subjectBasicId = e.subjectbasicEntityList[0].id
       e.subjectbasicEntityList[0].businessType = '1'
       this.dataForm.settlementInfoList = e.subjectbasicEntityList
+      const subjectInfo = e.subjectbasicEntityList[0]
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
       // todo 采购收货凭证生成采购单，选择合同后带出单价
       // e.productByContractModelList.forEach(item => {
       //   debugger
@@ -1786,6 +1843,28 @@ export default {
       val2.subjectBasicId = val2.id;
       val2.businessType = '1';
       this.dataForm.settlementInfoList[0] = val2;
+      const subjectInfo = val2
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
     },
     initPurchaseData() {
       const data = this.setting.selectData
@@ -1817,18 +1896,6 @@ export default {
             item.tax = item.inputTaxRate
             item.salesMainUnitId = item.unit
             item.voucherIdList = voucherIdList.voucherIds
-            // if (item.orderMainUnitIds) {
-            //   var unitName = JSON.parse(item.orderMainUnitIds)
-            //   var optArray = [];
-            //   for (let i = 0; i < unitName.length; i++) {
-            //     item.salesMainUnitId = unitName[0]
-            //     var opt = {};
-            //     opt.fullName = unitName[i];
-            //     opt.id = unitName[i];
-            //     optArray.push(opt);
-            //   }
-            //   item.businessorderproductrelationalsalesMainUnitIdOptions = optArray;
-            // }
           })
           this.dataForm.businessOrderProductRelationalList = list
         })
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
index 491d20f0..b398e8a1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
@@ -1752,9 +1752,14 @@ export default {
       }
       if (data.flag == "采购收货凭证生成收货单") {
         data.forEach(item => {
+          debugger
           item.voucherId = item.id;
+          item.businessType = '1'
           this.dataForm.deliveryProductRelationList = [];
           this.dataForm.deliveryVoucherRelationList.push(item);
+          item.voucherProductList.forEach(e => {
+            e.businessType = '1'
+          })
           this.dataForm.deliveryProductRelationList = item.voucherProductList;
         });
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
index c25e9fea..fecee037 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
@@ -886,7 +886,7 @@ export default {
         voucherStatus: [],
         documentType: [],
         associatedDocumentNo: [],
-        voucherproductproductId: [],
+        voucherproductproductId: [{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "supplierId", "required": "0" }],
         voucherproductspec: [],
         voucherproductunit: [],
         voucherproductgrossWeight: [],
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
index c6f0e063..ae5a3301 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue
@@ -54,7 +54,7 @@
                 :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
                 :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
                 popupTitle="选择数据" popupType="dialog" relationField='code' field='businessId'
-                interfaceId="529638640356183877" :pageSize="20"
+                interfaceId="529638640356183877" :pageSize="20" :hasPage="true"
                 :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -236,9 +236,9 @@
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectId')" prop="subjectId">
               <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
-                placeholder="请选择" :disabled="judgeWrite('subjectId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='subjectId' interfaceId="522693551289534725" :pageSize="20"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectId'
+                interfaceId="522693551289534725" :pageSize="20" :hasPage="true"
                 :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -247,8 +247,8 @@
             <jnpf-form-tip-item label="收货地址" v-if="judgeShow('deliveryAddress')"
               prop="deliveryAddress">
               <JnpfInput v-model="dataForm.deliveryAddress"
-                @change="changeData('deliveryAddress', -1)" placeholder="请输入"
-                :disabled="judgeWrite('deliveryAddress')" clearable :style='{ "width": "100%" }'>
+                @change="changeData('deliveryAddress', -1)" placeholder="请输入" :disabled="true"
+                clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -262,11 +262,11 @@
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
               <JnpfPopupSelect v-model="dataForm.enterpriseId"
                 @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
-                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
-                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
+                propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
+                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -274,11 +274,11 @@
             <jnpf-form-tip-item label="发货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
               <JnpfPopupSelect v-model="dataForm.warehouseId"
                 @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
-                interfaceId="522701377537837317" :pageSize="20"
-                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='warehouseId' interfaceId="522701377537837317"
+                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -287,10 +287,10 @@
               prop="shippingAddress">
               <JnpfPopupSelect v-model="dataForm.shippingAddress"
                 @change="changeData('shippingAddress', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.shippingAddress" placeholder="请选择"
-                :disabled="judgeWrite('shippingAddress')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
-                field='shippingAddress' interfaceId="522724961224231173" :pageSize="20"
+                :templateJson="interfaceRes.shippingAddress" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='addressDetail' field='shippingAddress'
+                interfaceId="522724961224231173" :pageSize="20"
                 :columnOptions="shippingAddresscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
@@ -334,13 +334,11 @@
                       @change="changeData('deliveryvoucherrelation-voucherId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucher_code' :field="'voucherId' + scope.$index"
-                      interfaceId="539440355490143877" :pageSize="20"
-                      :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
+                      placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='voucher_code'
+                      :field="'voucherId' + scope.$index" interfaceId="539440355490143877"
+                      :pageSize="20" :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
@@ -354,9 +352,7 @@
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.documentType"
                       @change="changeData('deliveryvoucherrelation-documentType', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-documentType')"
-                      clearable :style='{ "width": "100%" }'
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="deliveryvoucherrelationdocumentTypeOptions"
                       :props="deliveryvoucherrelationdocumentTypeProps">
                     </JnpfSelect>
@@ -372,9 +368,7 @@
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.voucherType"
                       @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherType')"
-                      clearable :style='{ "width": "100%" }'
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="deliveryvoucherrelationvoucherTypeOptions"
                       :props="deliveryvoucherrelationvoucherTypeProps">
                     </JnpfSelect>
@@ -389,9 +383,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.poundCode"
                       @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundCode')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -407,8 +399,7 @@
                     <JnpfDatePicker v-model="scope.row.poundlistTime"
                       @change="changeData('deliveryvoucherrelation-poundlistTime', scope.$index)"
                       :startTime="dateTime(false, 1, 1, '', '')"
-                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundlistTime')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
index a8978f72..04944ad1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
@@ -141,7 +141,7 @@
                       :disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                       relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="545146513462930117" :pageSize="20"
+                      interfaceId="545146513462930117" :pageSize="20" :hasPage="true"
                       :columnOptions="voucherproductproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
@@ -862,7 +862,7 @@ export default {
         voucherStatus: [],
         documentType: [],
         associatedDocumentNo: [],
-        voucherproductproductId: [],
+        voucherproductproductId: [{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "customerId", "required": "0" }],
         voucherproductspec: [],
         voucherproductunit: [],
         voucherproductgrossWeight: [],
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
index c64053df..64cc40e7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@@ -10,15 +10,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="凭证类型">
-              <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
-                :props="voucherTypeProps" multiple>
+              <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
+                :options="voucherTypeOptions" :props="voucherTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -33,7 +33,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -46,14 +47,17 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
             </el-button>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="createSaleOrder()">生成销售单
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="createSaleOrder()">生成销售单
             </el-button>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createDeliveryOrder()">生成发货单
@@ -68,20 +72,25 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column border>
-          <el-table-column prop="voucherCode" label="凭证编号" sortable align="center" fixed="left" width="160">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
+          border>
+          <el-table-column prop="voucherCode" label="凭证编号" sortable align="center" fixed="left"
+            width="160">
           </el-table-column>
-          <el-table-column label="单据类型" prop="documentType1" sortable align="center" fixed="left" width="100">
+          <el-table-column label="单据类型" prop="documentType1" sortable align="center" fixed="left"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.documentType1 }}
             </template>
           </el-table-column>
-          <el-table-column label="凭证类型" prop="voucherType1" sortable align="center" fixed="left" width="100">
+          <el-table-column label="凭证类型" prop="voucherType1" sortable align="center" fixed="left"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.voucherType1 }}
             </template>
@@ -103,7 +112,8 @@
           </el-table-column>
           <el-table-column prop="poundCode" label="磅单编号" sortable align="center" width="160">
           </el-table-column>
-          <el-table-column prop="purchaseDeliveryOrder" label="关联单据号" sortable align="center" width="160">
+          <el-table-column prop="purchaseDeliveryOrder" label="关联单据号" sortable align="center"
+            width="160">
           </el-table-column>
           <el-table-column prop="vehicleNumber" label="车牌号" sortable align="center" width="100">
           </el-table-column>
@@ -112,7 +122,8 @@
               {{ scope.row.modeTransport1 }}
             </template>
           </el-table-column>
-          <el-table-column label="承运方式" prop="transportationMethod1" sortable align="center" width="100">
+          <el-table-column label="承运方式" prop="transportationMethod1" sortable align="center"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.transportationMethod1 }}
             </template>
@@ -125,7 +136,8 @@
           </el-table-column>
           <el-table-column prop="destination" label="到达地" sortable align="center" width="200">
           </el-table-column>
-          <el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center" width="200">
+          <el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center"
+            width="200">
           </el-table-column>
           <el-table-column prop="preparationTime" label="制单时间" sortable align="center" width="100">
             <template slot-scope="scope">
@@ -170,26 +182,30 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
@@ -348,11 +364,11 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
@@ -383,7 +399,7 @@ export default {
         return
       }
       selectData.flag = '发货凭证生成销售订单'
-      selectData.deliveryType = '3'
+      selectData.deliveryType = '2'
       if (!this.saleOrderFlowList.length) {
         this.$message({ type: 'error', message: '流程不存在' });
       } else if (this.saleOrderFlowList.length === 1) {
@@ -404,11 +420,11 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue
index 2eaf1dbb..dbe2d0bb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/form.vue
@@ -6,10 +6,10 @@
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基本信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基本信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('receiptType')">
             <jnpf-form-tip-item label-width="0" prop="receiptType">
@@ -20,10 +20,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="基础信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基础信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('receiptCode')">
             <jnpf-form-tip-item label="订单编号" v-if="judgeShow('receiptCode')" prop="receiptCode">
@@ -44,10 +44,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="关联信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="退货单" v-if="judgeShow('businessId')" prop="businessId">
@@ -56,7 +56,7 @@
                 placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                 relationField='returnCargoCode' field='businessId' interfaceId="531492712415758085"
-                :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable
+                :pageSize="20" :hasPage="true" :columnOptions="businessIdcolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -66,11 +66,10 @@
               prop="reservedFields1">
               <JnpfPopupSelect v-model="dataForm.reservedFields1"
                 @change="changeData('reservedFields1', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.reservedFields1" placeholder="请选择"
-                :disabled="judgeWrite('reservedFields1')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='reservedFields1'
-                interfaceId="517979330417001669" :pageSize="20"
-                :columnOptions="reservedFields1columnOptions" clearable
+                :templateJson="interfaceRes.reservedFields1" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='reservedFields1' interfaceId="517979330417001669"
+                :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -83,7 +82,7 @@
               <el-table :data="dataForm.saleReturnCargoOrderInfo" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
                 <el-table-column label="销售退货订单" v-if="judgeShow('warehousingproduct-productName')"
-                  prop="code">
+                  prop="code" width="210">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-productName')">*</span>销售退货订单
@@ -91,14 +90,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnCargoCode"
                       @change="changeData('warehousingproduct-productName', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-productName')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="订单类型"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>订单类型
@@ -127,7 +125,8 @@
                   </template>
                 </el-table-column> -->
                 <el-table-column label="关联客户(二级)"
-                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
+                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId"
+                  width="250">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联客户(二级)
@@ -135,14 +134,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.secondCustomName"
                       @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseUnitId')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')"
-                  prop="purchaseNum">
+                  prop="purchaseNum" width="250">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
@@ -150,14 +147,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.businessLineName"
                       @change="changeData('warehousingproduct-purchaseNum', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseNum')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="业务类型"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>业务类型
@@ -171,7 +167,8 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="币种"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>币种
@@ -185,7 +182,8 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="销售模式"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>销售模式
@@ -199,7 +197,8 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="交货方式"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>交货方式
@@ -213,7 +212,8 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="运输方式"
-                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>运输方式
@@ -230,18 +230,18 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="发货信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">发货信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectId')">
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectId')" prop="subjectId">
               <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
-                placeholder="请选择" :disabled="judgeWrite('subjectId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='subjectId' interfaceId="522693551289534725" :pageSize="20"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectId'
+                interfaceId="522693551289534725" :pageSize="20"
                 :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -250,26 +250,26 @@
             <jnpf-form-tip-item label="发货地址" v-if="judgeShow('shippingAddress')"
               prop="shippingAddress">
               <JnpfInput v-model="dataForm.shippingAddress"
-                @change="changeData('shippingAddress', -1)" placeholder="请输入"
-                :disabled="judgeWrite('shippingAddress')" clearable :style='{ "width": "100%" }'>
+                @change="changeData('shippingAddress', -1)" placeholder="请输入" :disabled="true"
+                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>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">收货信息</span>
+            </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
               <JnpfPopupSelect v-model="dataForm.enterpriseId"
                 @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
-                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
-                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
+                propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
+                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -277,11 +277,11 @@
             <jnpf-form-tip-item label="收货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
               <JnpfPopupSelect v-model="dataForm.warehouseId"
                 @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
-                interfaceId="522701377537837317" :pageSize="20"
-                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='warehouseId' interfaceId="522701377537837317"
+                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -290,20 +290,20 @@
               prop="deliveryAddress">
               <JnpfPopupSelect v-model="dataForm.deliveryAddress"
                 @change="changeData('deliveryAddress', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
-                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
-                field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
+                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='addressDetail' field='deliveryAddress'
+                interfaceId="522724961224231173" :pageSize="20"
                 :columnOptions="deliveryAddresscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="其他信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
@@ -314,10 +314,10 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24">
-            <jnpf-form-tip-item>
-              <JnpfGroupTitle content="商品信息" contentPosition="left">
-              </JnpfGroupTitle>
-            </jnpf-form-tip-item>
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品信息</span>
+            </div>
           </el-col>
           <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
             <jnpf-form-tip-item label-width="0">
@@ -327,7 +327,7 @@
               <el-table :data="dataForm.deliveryVoucherRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
                 <el-table-column label="凭证编号" v-if="judgeShow('deliveryvoucherrelation-voucherId')"
-                  prop="voucherId">
+                  prop="voucherId" width="210">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*</span>凭证编号
@@ -336,18 +336,17 @@
                     <JnpfPopupSelect v-model="scope.row.voucherId" @change="getSaleReceiptVoucher"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucherCode' :field="'voucherId' + scope.$index"
-                      interfaceId="531821041316530501" :pageSize="20"
-                      :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
+                      placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='voucherCode'
+                      :field="'voucherId' + scope.$index" interfaceId="531821041316530501"
+                      :pageSize="20" :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="单据类型"
-                  v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType">
+                  v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-documentType')">*</span>单据类型
@@ -355,16 +354,15 @@
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.documentType"
                       @change="changeData('deliveryvoucherrelation-documentType', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-documentType')"
-                      clearable :style='{ "width": "100%" }'
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="deliveryvoucherrelationdocumentTypeOptions"
                       :props="deliveryvoucherrelationdocumentTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="凭证类型"
-                  v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType">
+                  v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType"
+                  width="130">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherType')">*</span>凭证类型
@@ -372,16 +370,14 @@
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.voucherType"
                       @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherType')"
-                      clearable :style='{ "width": "100%" }'
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="deliveryvoucherrelationvoucherTypeOptions"
                       :props="deliveryvoucherrelationvoucherTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')"
-                  prop="poundCode">
+                  prop="poundCode" width="180">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundCode')">*</span>磅单编号
@@ -389,15 +385,14 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.poundCode"
                       @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundCode')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
                 <el-table-column label="磅单时间"
-                  v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime">
+                  v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime"
+                  width="180">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundlistTime')">*</span>磅单时间
@@ -406,14 +401,13 @@
                     <JnpfDatePicker v-model="scope.row.poundlistTime"
                       @change="changeData('deliveryvoucherrelation-poundlistTime', scope.$index)"
                       :startTime="dateTime(false, 1, 1, '', '')"
-                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundlistTime')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" :disabled="true"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
                 <el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleName')"
-                  prop="vehicleId">
+                  prop="vehicleId" width="170">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-vehicleName')">*</span>车牌号
@@ -437,7 +431,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')"
-                  prop="productId">
+                  prop="productId" width="250">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-productId')">*</span>商品名称
@@ -447,18 +441,16 @@
                       @change="changeData('deliveryvoucherrelation-productId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.deliveryvoucherrelationproductId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="529919666429100229" :pageSize="20"
-                      :columnOptions="deliveryvoucherrelationproductIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
+                      placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='name'
+                      :field="'productId' + scope.$index" interfaceId="529919666429100229"
+                      :pageSize="20" :columnOptions="deliveryvoucherrelationproductIdcolumnOptions"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
-                  prop="spec">
+                  prop="spec" width="150">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
@@ -466,14 +458,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
                       @change="changeData('deliveryvoucherrelation-spec', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-spec')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
-                  prop="unit">
+                  prop="unit" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
@@ -481,14 +471,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.unit"
                       @change="changeData('deliveryvoucherrelation-unit', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-unit')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')"
-                  prop="grossWeight">
+                  prop="grossWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-grossWeight')">*</span>毛重
@@ -496,14 +484,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
                       @change="changeData('deliveryvoucherrelation-grossWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-grossWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')"
-                  prop="tareWeight">
+                  prop="tareWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-tareWeight')">*</span>皮重
@@ -511,14 +497,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
                       @change="changeData('deliveryvoucherrelation-tareWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-tareWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="扣重" v-if="judgeShow('deliveryvoucherrelation-buckleWeight')"
-                  prop="buckleWeight">
+                  prop="buckleWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-buckleWeight')">*</span>扣重
@@ -526,14 +510,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
                       @change="changeData('deliveryvoucherrelation-buckleWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-buckleWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')"
-                  prop="netWeight">
+                  prop="netWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-netWeight')">*</span>净重
@@ -541,14 +523,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
                       @change="changeData('deliveryvoucherrelation-netWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-netWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')"
-                  prop="remark">
+                  prop="remark" width="150">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
@@ -584,7 +564,7 @@
               <el-table :data="dataForm.deliveryProductRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
                 <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
-                  prop="productId">
+                  prop="productId" width="250">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
@@ -594,18 +574,16 @@
                       @change="changeData('deliveryproductrelation-productId', scope.$index)"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.deliveryproductrelationproductId"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="529919666429100229" :pageSize="20"
-                      :columnOptions="deliveryproductrelationproductIdcolumnOptions" clearable
-                      :style='{ "width": "100%" }'>
+                      placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                      popupTitle="选择数据" popupType="dialog" relationField='name'
+                      :field="'productId' + scope.$index" interfaceId="529919666429100229"
+                      :pageSize="20" :columnOptions="deliveryproductrelationproductIdcolumnOptions"
+                      clearable :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')"
-                  prop="spec">
+                  prop="spec" width="150">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
@@ -613,15 +591,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
                       @change="changeData('deliveryproductrelation-spec', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-spec')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="库存单位"
-                  v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                  v-if="judgeShow('deliveryproductrelation-inventoryUnitId')" prop="inventoryUnitId"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-inventoryUnitId')">*</span>库存单位
@@ -629,15 +605,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitId"
                       @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-inventoryUnitId')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="退货单位"
-                  v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
-                  prop="salesMainUnitId">
+                  v-if="judgeShow('deliveryproductrelation-salesMainUnitId')" prop="salesMainUnitId"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-salesMainUnitId')">*</span>退货单位
@@ -645,14 +619,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.salesMainUnitId"
                       @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-salesMainUnitId')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="退货数量" v-if="judgeShow('deliveryproductrelation-saleNum')"
-                  prop="saleNum">
+                  prop="saleNum" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>退货数量
@@ -660,14 +632,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.saleNum"
                       @change="changeData('deliveryproductrelation-saleNum', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-saleNum')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="收货单位"
-                  v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit">
+                  v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>收货单位
@@ -675,16 +646,14 @@
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.deliveryUnit"
                       @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
-                      clearable :style='{ "width": "100%" }'
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="deliveryproductrelationdeliveryUnitOptions"
                       :props="deliveryproductrelationdeliveryUnitProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
-                  prop="grossWeight">
+                  prop="grossWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-grossWeight')">*</span>毛重
@@ -692,14 +661,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
                       @change="changeData('deliveryproductrelation-grossWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-grossWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')"
-                  prop="tareWeight">
+                  prop="tareWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-tareWeight')">*</span>皮重
@@ -707,14 +674,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
                       @change="changeData('deliveryproductrelation-tareWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tareWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="扣重" v-if="judgeShow('deliveryproductrelation-buckleWeight')"
-                  prop="buckleWeight">
+                  prop="buckleWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-buckleWeight')">*</span>扣重
@@ -722,14 +687,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
                       @change="changeData('deliveryproductrelation-buckleWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-buckleWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')"
-                  prop="netWeight">
+                  prop="netWeight" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-netWeight')">*</span>净重
@@ -737,14 +700,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
                       @change="changeData('deliveryproductrelation-netWeight', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-netWeight')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')"
-                  prop="cargoId">
+                  prop="cargoId" width="200">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
@@ -757,14 +718,15 @@
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-cargoId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                       relationField='cargo_name' :field="'cargoId' + scope.$index"
-                      interfaceId="530700536261903749" :pageSize="20"
+                      interfaceId="530700536261903749" :pageSize="20" :hasPahe="true"
                       :columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
                 <el-table-column label="收货数量"
-                  v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum">
+                  v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryNum')">*</span>收货数量
@@ -779,7 +741,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')"
-                  prop="batchNo">
+                  prop="batchNo" width="170">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
@@ -795,7 +757,8 @@
                 </el-table-column>
 
                 <el-table-column label="生产日期"
-                  v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime">
+                  v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime"
+                  width="170">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-produceTime')">*</span>生产日期
@@ -811,7 +774,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="退货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')"
-                  prop="returnUnit">
+                  prop="returnUnit" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>退货单价
@@ -819,14 +782,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnUnit"
                       @change="changeData('deliveryproductrelation-returnUnit', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-returnUnit')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')"
-                  prop="tax">
+                  prop="tax" width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
@@ -834,14 +795,12 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tax"
                       @change="changeData('deliveryproductrelation-tax', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tax')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')"
-                  prop="taxCount">
+                  prop="taxCount" width="150">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-taxCount')">*</span>含税小计
@@ -849,14 +808,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.taxCount"
                       @change="changeData('deliveryproductrelation-taxCount', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-taxCount')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="不含税单价"
-                  v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice">
+                  v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice"
+                  width="120">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxPrice')">*</span>不含税单价
@@ -864,14 +822,13 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxPrice"
                       @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxPrice')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="不含税小计"
-                  v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount">
+                  v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount"
+                  width="150">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxCount')">*</span>不含税小计
@@ -879,9 +836,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxCount"
                       @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxCount')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
index b91e4caa..48a691ae 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
@@ -49,7 +49,7 @@
                 placeholder="请选择" :disabled="judgeWrite('associateThirdSuppliers')" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
                 field='associateThirdSuppliers' interfaceId="530001884988047877" :pageSize="20"
-                :columnOptions="associateThirdSupplierscolumnOptions" clearable
+                :hasPaage="true" :columnOptions="associateThirdSupplierscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -87,8 +87,8 @@
                 :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
                 propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                 relationField='vehicle_number' field='vehicleId' interfaceId="529920852288864453"
-                :pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
-                :style='{ "width": "100%" }'>
+                :pageSize="20" :hasPage="true" :columnOptions="vouchervehiclevehicleIdcolumnOptions"
+                clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -102,7 +102,7 @@
                 :templateJson="interfaceRes.firstSubjectBasicId" placeholder="请选择" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
                 field='firstSubjectBasicId' interfaceId="530001731111617029" :pageSize="20"
-                :columnOptions="firstSubjectBasicIdcolumnOptions" clearable
+                :hasPage="true" :columnOptions="firstSubjectBasicIdcolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -117,7 +117,7 @@
                 :disabled="judgeWrite('customerName')" :templateJson="interfaceRes.enterpriseId"
                 placeholder="请选择" propsValue="f_id" popupWidth="800px" popupTitle="选择数据"
                 popupType="dialog" relationField='f_full_name' field='enterpriseId'
-                interfaceId="522729853024209157" :pageSize="20"
+                interfaceId="522729853024209157" :pageSize="20" :hasPage="true"
                 :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -141,7 +141,7 @@
                       :disabled="judgeWrite('voucherproductList') || judgeWrite('voucherproductList-productId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                       relationField='name' :field="'productId' + scope.$index"
-                      interfaceId="545146513462930117" :pageSize="20"
+                      interfaceId="545146513462930117" :pageSize="20" :hasPage="true"
                       :columnOptions="voucherproductproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
@@ -860,7 +860,7 @@ export default {
         voucherStatus: [],
         documentType: [],
         associatedDocumentNo: [],
-        voucherproductproductId: [],
+        voucherproductproductId: [{ "fieldName": "", "field": "subjectId", "defaultValue": "", "jnpfKey": "popupSelect", "dataType": "varchar", "id": "spNokw1", "relationField": "supplierId", "required": "0" }],
         voucherproductspec: [],
         voucherproductunit: [],
         voucherproductgrossWeight: [],
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue
index 47a2210e..b5a66709 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/form.vue
@@ -84,7 +84,7 @@
                 :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
                 :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
                 popupTitle="选择数据" popupType="dialog" relationField='code' field='businessId'
-                interfaceId="550326589192158853" :pageSize="20"
+                interfaceId="550326589192158853" :pageSize="20" :hasPage="true"
                 :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -94,11 +94,10 @@
               prop="reservedFields1">
               <JnpfPopupSelect v-model="dataForm.reservedFields1"
                 @change="changeData('reservedFields1', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.reservedFields1" placeholder="请选择"
-                :disabled="judgeWrite('reservedFields1')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='reservedFields1'
-                interfaceId="517979330417001669" :pageSize="20"
-                :columnOptions="reservedFields1columnOptions" clearable
+                :templateJson="interfaceRes.reservedFields1" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='reservedFields1' interfaceId="517979330417001669"
+                :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -119,9 +118,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.code"
                       @change="changeData('warehousingproduct-productName', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-productName')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -163,9 +160,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.secondCustomName"
                       @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseUnitId')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -178,9 +173,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.businessLineName"
                       @change="changeData('warehousingproduct-purchaseNum', scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-purchaseNum')"
-                      clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -267,9 +260,9 @@
             <jnpf-form-tip-item label="客户名称" v-if="judgeShow('subjectId')" prop="subjectId">
               <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
-                placeholder="请选择" :disabled="judgeWrite('subjectId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='subjectId' interfaceId="522693551289534725" :pageSize="20"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectId'
+                interfaceId="522693551289534725" :pageSize="20"
                 :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -278,8 +271,8 @@
             <jnpf-form-tip-item label="发货地址" v-if="judgeShow('shippingAddress')"
               prop="shippingAddress">
               <JnpfInput v-model="dataForm.shippingAddress"
-                @change="changeData('shippingAddress', -1)" placeholder="请输入"
-                :disabled="judgeWrite('shippingAddress')" clearable :style='{ "width": "100%" }'>
+                @change="changeData('shippingAddress', -1)" placeholder="请输入" :disabled="true"
+                clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -293,11 +286,11 @@
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
               <JnpfPopupSelect v-model="dataForm.enterpriseId"
                 @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
-                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
-                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
+                propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
+                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -305,11 +298,11 @@
             <jnpf-form-tip-item label="收货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
               <JnpfPopupSelect v-model="dataForm.warehouseId"
                 @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
-                interfaceId="522701377537837317" :pageSize="20"
-                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='warehouseId' interfaceId="522701377537837317"
+                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -318,10 +311,10 @@
               prop="deliveryAddress">
               <JnpfPopupSelect v-model="dataForm.deliveryAddress"
                 @change="changeData('deliveryAddress', -1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
-                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
-                field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
+                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='addressDetail' field='deliveryAddress'
+                interfaceId="522724961224231173" :pageSize="20"
                 :columnOptions="deliveryAddresscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleGuide/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleGuide/index.vue
new file mode 100644
index 00000000..5726497a
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleGuide/index.vue
@@ -0,0 +1,449 @@
+<template>
+  <div class="csty-guide-box">
+    <div class="csty-guide-title">
+      <span style="color: #409EFF">▋</span>
+      <span style="font-size: 14px;font-weight: 500;color:#666666;">进货</span>
+    </div>
+    <div class="csty-guide-des">
+      <span style="font-size: 12px;font-weight: 400;color:#666666;">
+        通过多种方式，发起销售请求，增加商品库存。
+      </span>
+    </div>
+    <div class="csty-guide-cnt">
+      <div class="csty-guide-cnt-box-item">
+        <el-row>
+          <el-col :span="5">
+            <div style="padding:15px 0px 0px 15px;">
+              <!-- <el-avatar :size="60" src="circleUrl"></el-avatar> -->
+            </div>
+          </el-col>
+          <el-col :span="19">
+            <el-row>
+              <el-col :span="24">
+                <div style="height:35px;line-height: 28px;margin-top:15px">
+                  <span style="color: #666666;font-size: 18px;">
+                    向客户销售（仓配）
+                  </span>
+                </div>
+              </el-col>
+              <el-col :span="24">
+                <div style="height:40px;line-height: 24px;">
+                  <span style="color: #999999;font-size: 12px;">
+                    根据客户要货请求，进行审核、提交仓库出库。
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
+              <el-row>
+                <el-col>1、销售员 录入
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/extend/supplier/subjectbasic')">客户信息</span></el-col>
+                <el-col>
+                  2、销售员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/contractL')">销售合同</span>，提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span>
+                  并下发
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationsale')">出库通知单</span>
+                </el-col>
+                <el-col>3、供应商物流人员 配送送货</el-col>
+                <el-col>
+                  4、仓管员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationsale')">出库通知单</span>
+                  和
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/deliveryVoucher')">发货凭证</span>
+                  新增
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousing/warehousingoutbound')">出库单</span>
+                  减少库存
+                </el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="csty-guide-cnt-box-item">
+        <el-row>
+          <el-col :span="5">
+            <div style="padding:15px 0px 0px 15px;">
+              <!-- <el-avatar :size="60" :src="circleUrl"></el-avatar> -->
+            </div>
+          </el-col>
+          <el-col :span="19">
+            <el-row>
+              <el-col :span="24">
+                <div style="height:35px;line-height: 28px;margin-top:15px">
+                  <span style="color: #666666;font-size: 18px;">
+                    向客户销售（直送）
+                  </span>
+                </div>
+              </el-col>
+              <el-col :span="24">
+                <div style="height:40px;line-height: 24px;">
+                  <span style="color: #999999;font-size: 12px;">
+                    根据客户要货请求，进行审核、提交客户自提。
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
+              <el-row>
+                <el-col>1、销售员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/contractL')">销售合同</span>，提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span></el-col>
+                <el-col>2、采购员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/contractL')">销售合同</span>
+                  提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/contractL')">采购合同</span>
+                </el-col>
+                <el-col>3、销售员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span>
+                  提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/purchaseOrder')">采购订单</span></el-col>
+                <el-col>4、供应商物流人员 配送发货至客户</el-col>
+                <el-col>5、销售员 根据 客户的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
+                  生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/deliveryVoucher')">发货凭证</span></el-col>
+                <el-col>
+                  6、采购员 根据 客户的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货凭证</span>
+                  生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/receiptVoucher')">收货单</span> 增加库存
+                </el-col>
+                <el-col>7、采购员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/deliveryVoucher')">发货凭证</span>
+                  生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/deliveryOrder')">发货单</span>
+                  减少库存</el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+
+      <div style="clear:both;"></div>
+    </div>
+    <div class="csty-guide-title">
+      <span style="color: #409EFF">▋</span>
+      <span style="font-size: 14px;font-weight: 500;color:#666666;">退货</span>
+    </div>
+    <div class="csty-guide-des">
+      <span style="font-size: 12px;font-weight: 400;color:#666666;">
+        根据不同的退货协议，将商品退给不同的来源。
+      </span>
+    </div>
+    <div class="csty-guide-cnt">
+      <div class="csty-guide-cnt-box-item">
+        <el-row>
+          <el-col :span="5">
+            <div style="padding:15px 0px 0px 15px;">
+              <!-- <el-avatar :size="60" :src="circleUrl"></el-avatar> -->
+            </div>
+          </el-col>
+          <el-col :span="19">
+            <el-row>
+              <el-col :span="24">
+                <div style="height:35px;line-height: 28px;margin-top:15px">
+                  <span style="color: #666666;font-size: 18px;">
+                    向仓库退货
+                  </span>
+                </div>
+              </el-col>
+              <el-col :span="24">
+                <div style="height:40px;line-height: 24px;">
+                  <span style="color: #999999;font-size: 12px;">
+                    按照与客户的退货协议，将商品退给仓库。
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
+              <el-row>
+                <el-col>1、销售员 提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/returnCargoOrder')">退货单</span></el-col>
+                <el-col>2、销售经理 审核
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/returnCargoOrder')">退货单</span>
+                </el-col>
+                <el-col>3、销售员 确定
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/returnCargoOrder')">退货单</span>，下发
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationpurchase')">入库通知单</span>
+                </el-col>
+                <el-col>4、仓管员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousingnotification/warehousingnotificationpurchase')">入库通知单</span>
+                  和
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptVoucher')">收货凭证</span> 新增
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/warehousing/warehousingstorage')">入库单</span> 验货入库
+                  增加库存</el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="csty-guide-cnt-box-item">
+        <el-row>
+          <el-col :span="5">
+            <div style="padding:15px 0px 0px 15px;">
+              <!-- <el-avatar :size="60" :src="circleUrl"></el-avatar> -->
+            </div>
+          </el-col>
+          <el-col :span="19">
+            <el-row>
+              <el-col :span="24">
+                <div style="height:35px;line-height: 28px;margin-top:15px">
+                  <span style="color: #666666;font-size: 18px;">
+                    向供应商退货（直送）
+                  </span>
+                </div>
+              </el-col>
+              <el-col :span="24">
+                <div style="height:40px;line-height: 24px;">
+                  <span style="color: #999999;font-size: 12px;">
+                    根据客户需求，向供应商退货，客户直退供应商
+                  </span>
+                </div>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding: 0px 45px;font-size: 14px;color: #999999;line-height:25px;">
+              <el-row>
+                <el-col>1、销售员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/saleOrder')">销售订单</span> 提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/returnCargoOrder')">退货单</span></el-col>
+                <el-col>2、采购员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/returnCargoOrder')">退货单</span> 提交
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/returnCargoOrder')">退供单</span></el-col>
+                <el-col>3、供应商物流人员 收到货物后</el-col>
+                <el-col>4、采购员 根据 供应商的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptVoucher')">收货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span></el-col>
+                <el-col>
+                  5、销售员 根据 供应商的
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptVoucher')">收货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/saleCenter/receiptOrder')">收货单</span> 增加库存
+                </el-col>
+                <el-col>6、采购员 根据
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryVoucher')">发货凭证</span> 生成
+                  <span style="cursor:pointer;color:#409eff;"
+                    @click="fnGo('/scm/purchaseCenter/deliveryOrder')">发货单</span> 减少库存</el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div style="clear:both;"></div>
+    </div>
+    <el-dialog title="如何添加商品库存" :close-on-click-modal="false" :visible.sync="dialogVisibleA"
+      class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body width="750px">
+      <div>
+        <el-row>
+          <el-col :span="6">
+            <div class="dialoga-item">
+              <div class="dialoga-item-num">
+                <img src="@/assets/images/u51.svg"
+                  style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
+                <span>1</span>
+              </div>
+              <div class="dialoga-item-cnt">
+                <img src="@/assets/images/u39.png"
+                  style="width:60px;height:60px;margin: 15px 0px;" />
+                <div>在 【商品库】 中 新建商品</div>
+              </div>
+              <div class="dialoga-item-link">
+                <span style="cursor:pointer;" @click="fnGo('/scm/productWarehouse')">前往新建></span>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="dialoga-item">
+              <div class="dialoga-item-num">
+                <img src="@/assets/images/u51.svg"
+                  style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
+                <span>2</span>
+              </div>
+              <div class="dialoga-item-cnt">
+                <img src="@/assets/images/u40.png"
+                  style="width:60px;height:60px;margin: 15px 0px;" />
+                <div>在 【供应商】中新建供应商</div>
+              </div>
+              <div class="dialoga-item-link">
+                <span style="cursor:pointer;"
+                  @click="fnGo('/extend/supplier/subjectbasic')">前往新建></span>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="dialoga-item">
+              <div class="dialoga-item-num">
+                <img src="@/assets/images/u51.svg"
+                  style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
+                <span>3</span>
+              </div>
+              <div class="dialoga-item-cnt">
+                <img src="@/assets/images/u41.png"
+                  style="width:60px;height:60px;margin: 15px 0px;" />
+                <div>在【采购订单】中新建采购订单</div>
+              </div>
+              <div class="dialoga-item-link">
+                <span style="cursor:pointer;"
+                  @click="fnGo('/scm/purchaseCenter/purchaseOrder')">前往新建></span>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="dialoga-item">
+              <div class="dialoga-item-num">
+                <img src="@/assets/images/u51.svg"
+                  style="width:100%;height:100%;position:absolute;left:0px;top:0px;" />
+                <span>4</span>
+              </div>
+              <div class="dialoga-item-cnt">
+                <img src="@/assets/images/u42.png"
+                  style="width:60px;height:60px;margin: 15px 0px;" />
+                <div>在【采购入库】中将商品入库</div>
+              </div>
+              <div class="dialoga-item-link">
+                <span style="cursor:pointer;"
+                  @click="fnGo('/scm/purchaseCenter/purchaseOrder')">前往新建></span>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisibleA = false">知道了</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data() {
+    return {
+      dialogVisibleA: true
+    };
+  },
+  computed: {},
+
+  created() { },
+  methods: {
+    fnGo(path) {
+      this.$router.push(path);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.csty-guide-box {
+  position: relative;
+  background: #fff;
+  padding: 30px 50px;
+  z-index: 1000;
+}
+.csty-guide-title {
+}
+.csty-guide-des {
+  line-height: 28px;
+}
+.csty-guide-cnt {
+}
+.csty-guide-cnt-box-item {
+  float: left;
+  width: 450px;
+  height: 405px;
+  margin: 20px 50px 50px 0px;
+  border: solid rgba(242, 242, 242, 1) 1px;
+  border-radius: 5px;
+}
+.el-avatar {
+  background: rgba(115, 160, 250, 1);
+}
+.dialoga-item {
+  text-align: center;
+}
+.dialoga-item-num {
+  top: 20px;
+  left: 15px;
+  width: 45px;
+  height: 45px;
+  position: relative;
+  text-align: center;
+  line-height: 45px;
+  font-weight: 700;
+  font-style: normal;
+  font-size: 20px;
+  color: #02a7f0;
+}
+.dialoga-item-cnt {
+  margin: 0px auto;
+  width: 120px;
+  height: 148px;
+  background-color: rgba(228, 228, 228, 0.2196078431372549);
+}
+.dialoga-item-link {
+  margin: 10px auto;
+  width: 120px;
+  height: 35px;
+  line-height: 35px;
+  text-align: center;
+  color: #409eff;
+  background-color: rgba(64, 158, 255, 0.043137254901960784);
+}
+>>> .el-dialog__body {
+  height: 280px;
+  padding: 0 0 10px !important;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .JNPF-common-search-box {
+    margin-bottom: 0;
+
+    .JNPF-common-search-box-right {
+      padding: 10px 10px 0 0;
+    }
+  }
+}
+</style>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue
index b270081a..5565ca7b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleInBoundNotice/form.vue
@@ -55,9 +55,9 @@
             <jnpf-form-tip-item label="销售订单" v-if="judgeShow('businessId')" prop="businessId">
               <JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
-                placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='code'
-                field='businessId' interfaceId="546699288491601093" :pageSize="20"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='code' field='businessId'
+                interfaceId="546699288491601093" :pageSize="20"
                 :columnOptions="businessIdcolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -78,9 +78,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.code"
                       @change="changeData('warehousingproduct-productName',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-productName')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -122,9 +120,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.secondCustomName"
                       @change="changeData('warehousingproduct-purchaseUnitId',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseUnitId')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -137,9 +133,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.businessLineName"
                       @change="changeData('warehousingproduct-purchaseNum',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseNum')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -255,11 +249,11 @@
               prop="subjectBasicId">
               <JnpfPopupSelect v-model="dataForm.subjectBasicId"
                 @change="changeData('subjectBasicId',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.subjectBasicId" placeholder="请选择"
-                :disabled="judgeWrite('subjectBasicId')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='name' field='subjectBasicId'
-                interfaceId="522693551289534725" :pageSize="20"
-                :columnOptions="subjectBasicIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                :templateJson="interfaceRes.subjectBasicId" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='subjectBasicId' interfaceId="522693551289534725"
+                :pageSize="20" :columnOptions="subjectBasicIdcolumnOptions" clearable
+                :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -267,8 +261,8 @@
             <jnpf-form-tip-item label="发货地址" v-if="judgeShow('shippingAddress')"
               prop="shippingAddress">
               <JnpfInput v-model="dataForm.shippingAddress"
-                @change="changeData('shippingAddress',-1)" placeholder="请输入"
-                :disabled="judgeWrite('shippingAddress')" clearable :style='{"width":"100%"}'>
+                @change="changeData('shippingAddress',-1)" placeholder="请输入" :disabled="true"
+                clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -282,11 +276,11 @@
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
               <JnpfPopupSelect v-model="dataForm.enterpriseId"
                 @change="changeData('enterpriseId',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
-                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
-                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择" :disabled="true"
+                propsValue="f_id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
+                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable
+                :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -294,9 +288,9 @@
             <jnpf-form-tip-item label="收货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
               <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)"
                 :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
-                placeholder="请选择" :disabled="judgeWrite('warehouseId')" propsValue="id"
-                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                field='warehouseId' interfaceId="529573170819104773" :pageSize="20"
+                placeholder="请选择" :disabled="true" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
+                interfaceId="529573170819104773" :pageSize="20"
                 :columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -306,10 +300,10 @@
               prop="deliveryAddress">
               <JnpfPopupSelect v-model="dataForm.deliveryAddress"
                 @change="changeData('deliveryAddress',-1)" :rowIndex="null" :formData="dataForm"
-                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
-                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
-                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
-                field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
+                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='addressDetail' field='deliveryAddress'
+                interfaceId="522724961224231173" :pageSize="20"
                 :columnOptions="deliveryAddresscolumnOptions" clearable :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -350,9 +344,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.productName"
                       @change="changeData('warehousingproduct-productName',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-productName')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -365,8 +357,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
                       @change="changeData('warehousingproduct-spec',scope.$index)" placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-spec')"
-                      clearable :style='{"width":"100%"}'>
+                      :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -379,9 +370,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitId"
                       @change="changeData('warehousingproduct-inventoryUnitId',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-inventoryUnitId')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -394,9 +383,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.purchaseUnitId"
                       @change="changeData('warehousingproduct-purchaseUnitId',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseUnitId')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -409,9 +396,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.purchaseNum"
                       @change="changeData('warehousingproduct-purchaseNum',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-purchaseNum')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -424,9 +409,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.storageAreaId"
                       @change="changeData('warehousingproduct-storageAreaId',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-storageAreaId')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -440,9 +423,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.warehousingUnitId"
                       @change="changeData('warehousingproduct-warehousingUnitId',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-warehousingUnitId')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -501,9 +482,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.batchNo"
                       @change="changeData('warehousingproduct-batchNo',scope.$index)"
-                      placeholder="请输入"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-batchNo')"
-                      clearable :style='{"width":"100%"}'>
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -518,9 +497,8 @@
                     <JnpfDatePicker v-model="scope.row.produceDate"
                       @change="changeData('warehousingproduct-produceDate',scope.$index)"
                       :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('warehousingproductList')||judgeWrite('warehousingproductList-produceDate')"
-                      clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
+                      placeholder="请选择" :disabled="true" clearable :style='{"width":"100%"}'
+                      type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
index bac50cc6..7bb05c2d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
@@ -104,18 +104,38 @@
                 <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">关联信息</span>
               </div>
             </el-col>
-            <el-col :span="8" v-if="judgeShow('contractId')">
-              <jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
-                <JnpfPopupSelect v-model="dataForm.contractId" @change="contractInfo"
-                  :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId"
-                  placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                  popupType="dialog" relationField='contractName' field='contractId'
-                  interfaceId="531872211288459717" :pageSize="20" :hasPage="true"
-                  :columnOptions="contractIdcolumnOptions" clearable :style='{ "width": "100%" }'
-                  @click.native="relationBusinessLine">
-                </JnpfPopupSelect>
-              </jnpf-form-tip-item>
-            </el-col>
+            <template v-if="!this.productCreate">
+              <el-col :span="8" v-if="judgeShow('contractId')">
+                <jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
+                  <JnpfPopupSelect v-model="dataForm.contractId" @change="contractInfo"
+                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractId"
+                    placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                    popupType="dialog" relationField='contractName' field='contractId'
+                    interfaceId="531872211288459717" :pageSize="20" :hasPage="true"
+                    :columnOptions="contractIdcolumnOptions" clearable :style='{ "width": "100%" }'
+                    @click.native="relationBusinessLine">
+                  </JnpfPopupSelect>
+                </jnpf-form-tip-item>
+              </el-col>
+            </template>
+            <template v-if="this.productCreate">
+              <el-col :span="8" v-if="judgeShow('contractId')">
+                <jnpf-form-tip-item label="关联合同" v-if="judgeShow('contractId')" prop="contractId">
+                  <!-- <JnpfPopupSelect v-model="dataForm.contractId" @change="contractInfo2" :rowIndex="null"
+                  :formData="dataForm" :templateJson="interfaceRes.contractName" placeholder="请选择" propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='contract_name'
+                  field='contractId' interfaceId="529270998021701701" :pageSize="20"
+                  :columnOptions="contractIdcolumnOptions2" clearable :style='{ "width": "100%" }'
+                >
+                </JnpfPopupSelect> -->
+                  <el-input v-model="dataForm.contractName" placeholder="请输入" :disabled="true"
+                    clearable :style='{ "width": "100%" }'>
+                    <el-button slot="append" icon="el-icon-search"
+                      @click="contractInfo2"></el-button>
+                  </el-input>
+                </jnpf-form-tip-item>
+              </el-col>
+            </template>
             <el-table :data="dataForm.contractInfoList" size='mini'>
               <el-table-column type="index" width="50" label="序号" align="center" />
               <el-table-column label="合同名称" v-if="judgeShow('businessorderproductrelational-tax')"
@@ -575,7 +595,8 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.advanceRatio"
                       @change="changeData('settlementinfo-advanceRatio', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable addonAfter="%"
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -588,7 +609,8 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.accountPeriod"
                       @change="changeData('settlementinfo-accountPeriod', scope.$index)"
-                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
+                      placeholder="请输入" :disabled="true" clearable addonAfter="天"
+                      :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
@@ -599,12 +621,16 @@
                       v-if="judgeRequired('settlementinfoList-underpaymentMethod')">*</span>压款方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.underpaymentMethod"
+                    <!-- <JnpfSelect v-model="scope.row.underpaymentMethod"
                       @change="changeData('settlementinfo-underpaymentMethod', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfounderpaymentMethodOptions"
                       :props="settlementinfounderpaymentMethodProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.underpaymentMethod"
+                      @change="changeData('settlementinfoList-underpaymentMethod',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="保证金方式" v-if="judgeShow('settlementinfo-marginMethod')"
@@ -614,12 +640,16 @@
                       v-if="judgeRequired('settlementinfoList-marginMethod')">*</span>保证金方式
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.marginMethod"
+                    <!-- <JnpfSelect v-model="scope.row.marginMethod"
                       @change="changeData('settlementinfo-marginMethod', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfomarginMethodOptions"
                       :props="settlementinfomarginMethodProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.marginMethod"
+                      @change="changeData('settlementinfoList-marginMethod',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <el-table-column label="逾期利率" v-if="judgeShow('settlementinfo-overdueInterestRate')"
@@ -629,12 +659,16 @@
                       v-if="judgeRequired('settlementinfoList-overdueInterestRate')">*</span>逾期利率
                   </template>
                   <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.overdueInterestRate"
+                    <!-- <JnpfSelect v-model="scope.row.overdueInterestRate"
                       @change="changeData('settlementinfo-overdueInterestRate', scope.$index)"
                       placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
                       :options="settlementinfooverdueInterestRateOptions"
                       :props="settlementinfooverdueInterestRateProps">
-                    </JnpfSelect>
+                    </JnpfSelect> -->
+                    <JnpfInput v-model="scope.row.overdueInterestRate"
+                      @change="changeData('settlementinfo-overdueInterestRate',scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{"width":"100%"}'>
+                    </JnpfInput>
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="申请压款金额/比例" v-if="judgeShow('settlementinfo-applyForUnderpaymentRatio')"
@@ -818,24 +852,44 @@
                     </JnpfInput>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="销售单位"
-                  v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
-                  prop="salesMainUnitId" width="120" align="center">
-                  <template slot="header">
-                    <span class="required-sign"
-                      v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>销售单位
-                  </template>
-                  <template slot-scope="scope">
-                    <JnpfSelect v-model="scope.row.salesMainUnitId"
-                      @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
-                      placeholder="请选择"
-                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
-                      clearable :style='{ "width": "100%" }'
-                      :options="scope.row.businessorderproductrelationalsalesMainUnitIdOptions"
-                      :props="businessorderproductrelationalsalesMainUnitIdProps">
-                    </JnpfSelect>
-                  </template>
-                </el-table-column>
+                <template v-if="!this.productCreate">
+                  <el-table-column label="销售单位"
+                    v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
+                    prop="salesMainUnitId" width="120" align="center">
+                    <template slot="header">
+                      <span class="required-sign"
+                        v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>销售单位
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfSelect v-model="scope.row.salesMainUnitId"
+                        @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
+                        placeholder="请选择"
+                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
+                        clearable :style='{ "width": "100%" }'
+                        :options="scope.row.businessorderproductrelationalsalesMainUnitIdOptions"
+                        :props="businessorderproductrelationalsalesMainUnitIdProps">
+                      </JnpfSelect>
+                    </template>
+                  </el-table-column>
+                </template>
+                <template v-if="this.productCreate">
+                  <el-table-column label="采购单位"
+                    v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
+                    prop="salesMainUnitId" width="120" align="center">
+                    <template slot="header">
+                      <span class="required-sign"
+                        v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
+                    </template>
+                    <template slot-scope="scope">
+                      <JnpfInput v-model="scope.row.salesMainUnitId"
+                        @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
+                        placeholder="请输入"
+                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
+                        clearable :style='{ "width": "100%" }' readonly>
+                      </JnpfInput>
+                    </template>
+                  </el-table-column>
+                </template>
                 <!-- <el-table-column label="订货量限制"
                   v-if="judgeShow('businessorderproductrelational-businessNum')" prop="businessNum"
                   width="350" align="center">
@@ -985,21 +1039,26 @@
                     </JnpfInput>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="操作" width="70"
-                  v-if="!judgeWrite('businessorderproductrelationalList')" fixed="right">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                      @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
-                  </template>
-                </el-table-column>
+                <template v-if="!this.productCreate">
+                  <el-table-column label="操作" width="70"
+                    v-if="!judgeWrite('businessorderproductrelationalList')" fixed="right">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                        @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
+                    </template>
+                  </el-table-column>
+                </template>
               </el-table>
-              <div class="table-actions" @click="choiceProduct"
-                v-if="this.dataForm.orderType == '3' && this.isLongAgreement == '2'">
-                <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
-              <div class="table-actions" @click="addProduct" v-if="this.dataForm.orderType == '1'">
-                <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              <template v-if="!this.productCreate">
+                <div class="table-actions" @click="choiceProduct"
+                  v-if="this.dataForm.orderType == '3' && this.isLongAgreement == '2'">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+                <div class="table-actions" @click="addProduct"
+                  v-if="this.dataForm.orderType == '1'">
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
+                </div>
+              </template>
             </jnpf-form-tip-item>
           </el-col>
           <!-- <el-col :span="24" v-if="judgeShow('status')">
@@ -1021,6 +1080,7 @@
       @refreshDataList="initProductList" />
     <BomProductGoodsBox v-if="BomgoodsBoxVisible1" ref="BomGoodsBox1"
       @refreshDataList="initProductList1" />
+    <OrderContractBox v-if="ContractBoxVisible" ref="ContractBox" @refreshDataList="contractList" />
   </div>
 </template>
 
@@ -1037,13 +1097,17 @@ import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime }
 import { thousandsFormat } from "@/components/Generator/utils/index"
 import ProductByContractBox from '@/views/scm/publicPopup/ProductByContractBox'
 import log from '@/views/system/printDev/log.vue';
-import BomProductGoodsBox from '@/views/scm/publicPopup/BomProductGoodsBox'
+import BomProductGoodsBox from '@/views/scm/publicPopup/ProductByContractBox'
+import OrderContractBox from '@/views/scm/publicPopup/OrderContractBox'
 export default {
   mixins: [comMixin],
   components: { ProductByContractBox, BomProductGoodsBox },
   props: [],
   data() {
     return {
+      ContractBoxVisible: false,
+      productIds: [],
+      productCreate: false,
       isLongAgreement: '',
       BomgoodsBoxVisible: false,
       BomgoodsBoxVisible1: false,
@@ -1452,22 +1516,15 @@ export default {
         }
       }
     },
-    choiceProduct(val) {
-      if (!val) {
-        this.$message({
-          type: 'error',
-          message: '请先关联合同',
-          duration: 1500,
-        })
-        return
-      }
+    choiceProduct() {
       this.BomgoodsBoxVisible = true
+      let subjectId = this.dataForm.firstSubjectBasicId
       let excludeIdList = [];
       for (let i = 0; i < this.dataForm.businessOrderProductRelationalList.length; i++) {
         excludeIdList.push(this.dataForm.businessOrderProductRelationalList[i].productId);
       }
       this.$nextTick(() => {
-        this.$refs.BomGoodsBox.init(excludeIdList, val)
+        this.$refs.BomGoodsBox.init(excludeIdList, subjectId)
       })
     },
     initProductList(list) {
@@ -1539,6 +1596,28 @@ export default {
       val2.subjectbasicEntityList[0].subjectBasicId = val2.subjectbasicEntityList[0].id
       val2.subjectbasicEntityList[0].businessType = '2'
       this.dataForm.settlementInfoList = val2.subjectbasicEntityList
+      const subjectInfo = val2.subjectbasicEntityList[0]
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
       val2.productByContractModelList.forEach(item => {
         item.notTaxPrice = this.jnpf.floatDiv(item.businessPrice, this.jnpf.floatAdd(1, this.jnpf.floatDiv(item.tax, 100))).toFixed(6)  //销售不含税单价
         item.notTaxCount = this.jnpf.floatMul(item.businessNum, item.notTaxPrice).toFixed(2) //销售不含税总价
@@ -1558,11 +1637,93 @@ export default {
       })
       this.dataForm.businessOrderProductRelationalList = val2.productByContractModelList
     },
+    contractInfo2() {
+      this.ContractBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ContractBox.init(this.dataForm.businessLineId, this.productIds)
+      })
+    },
+    contractList(list) {
+      let e = list
+      this.dataForm.contractId = e.id
+      this.dataForm.contractName = e.contractName
+      this.dataForm.expectArriveDate = [];
+      if (e.contractPeriodTime && e.contractPeriodTimeEnd) {
+        this.dataForm.expectArriveDate[0] = new Date(e.contractPeriodTime)
+        this.dataForm.expectArriveDate[1] = new Date(e.contractPeriodTimeEnd)
+      }
+      this.dataForm.contractInfoList = []
+      this.dataForm.contractInfoList[0] = e
+      this.dataForm.firstSubjectBasicId = e.subject
+      this.dataForm.enterpriseId = e.deptId
+      this.dataForm.receiveAddress = e.deliveryLocation
+      this.dataForm.transportMode = e.modeTransport
+      this.dataForm.transactionMode = e.deliveryModel
+      this.dataForm.deliveryAddress = e.deliveryLocation
+      e.subjectbasicEntityList[0].subjectBasicId = e.subjectbasicEntityList[0].id
+      e.subjectbasicEntityList[0].businessType = '1'
+      this.dataForm.settlementInfoList = e.subjectbasicEntityList
+      const subjectInfo = e.subjectbasicEntityList[0]
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
+      // todo 采购收货凭证生成采购单，选择合同后带出单价
+      // e.productByContractModelList.forEach(item => {
+      //   debugger
+      //   var productId = item.productId
+      //   var unit = item.unit
+      //   var price = item.businessPrice
+      //   const obj = this.dataForm.businessOrderProductRelationalList.find(e => e.productId == productId && e.salesMainUnitId == unit)
+      //   if (obj) {
+      //     obj.businessPrice = price
+      //   }
+      // })
+    },
     getCustomName(val, val2) {
       this.dataForm.settlementInfoList = [];
       val2.subjectBasicId = val2.id;
       val2.businessType = '2';
       this.dataForm.settlementInfoList[0] = val2;
+      const subjectInfo = val2
+      if (subjectInfo.underpaymentMethod == 0) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '无';
+      } else if (subjectInfo.underpaymentMethod == 1) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按金额(' + subjectInfo.applyForUnderpaymentRatio + '元)';
+      } else if (subjectInfo.underpaymentMethod == 2) {
+        this.dataForm.settlementInfoList[0].underpaymentMethod = '按比例(' + subjectInfo.applyForUnderpaymentRatio + '%)';
+      }
+      if (subjectInfo.marginMethod == 0) {
+        this.dataForm.settlementInfoList[0].marginMethod = '无';
+      } else if (subjectInfo.marginMethod == 1) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按金额(' + subjectInfo.applyForMarginRatio + '元)';
+      } else if (subjectInfo.marginMethod == 2) {
+        this.dataForm.settlementInfoList[0].marginMethod = '按比例(' + subjectInfo.applyForMarginRatio + '%)';
+      }
+      if (subjectInfo.overdueInterestRate == 0) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '无';
+      } else if (subjectInfo.overdueInterestRate == 1) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按年化(' + subjectInfo.applyForOverdueRatio + '%)';
+      } else if (subjectInfo.overdueInterestRate == 2) {
+        this.dataForm.settlementInfoList[0].overdueInterestRate = '按月化(' + subjectInfo.applyForOverdueRatio + '%)';
+      }
     },
     changeData(model, index) {
       this.isEdit = false
@@ -1629,13 +1790,35 @@ export default {
         this.dataForm.businessOrderProductRelationalList = data[0].businessOrderProductRelationalList
       }
       if (data.flag == '发货凭证生成销售订单') {
-        this.dataForm.orderType = '1'
+        this.productCreate = true
+        this.dataForm.orderType = '3'
         this.dataForm.enterpriseId = data[0].supplierId
         this.dataForm.firstSubjectBasicId = data[0].customerId
         this.dataForm.deliveryType = data.deliveryType
+        var voucherIdList = {
+          voucherIds: []
+        }
         data.forEach(item => {
-          this.dataForm.businessOrderProductRelationalList = [...item.voucherProductList, ...this.dataForm.businessOrderProductRelationalList]
+          voucherIdList.voucherIds.push(item.id)
         });
+        request({
+          url: `/api/scm/BusinessOrder/purchase/orderByVoucher`,
+          method: 'post',
+          data: voucherIdList
+        }).then(res => {
+          var list = res.data;
+          debugger
+          list.forEach(item => {
+            this.productIds.push(item.id)
+            item.productId = item.id
+            item.inventoryUnitId = item.inventoryUnitIds
+            item.businessNum = item.netWeight
+            item.tax = item.outputTaxRate
+            item.salesMainUnitId = item.unit
+            item.voucherIdList = voucherIdList.voucherIds
+          })
+          this.dataForm.businessOrderProductRelationalList = list
+        })
       }
     },
     selfInit() {