弹窗修改

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/controller/ArinvoicesController.java

@@ -14,14 +14,21 @@ import jnpf.base.vo.PaginationVO;
 import jnpf.base.UserInfo;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
+import jnpf.contractfile.service.ContractFileService;
+import jnpf.customer.entity.CustomerEntity;
+import jnpf.customer.service.CustomerService;
+import jnpf.contractfile.entity.ContractFileEntity;
 import jnpf.exception.DataException;
 import jnpf.invoices.entity.InvoicesItem0Entity;
+import jnpf.materialvo.entity.MaterialEntity;
+import jnpf.materialvo.service.MaterialService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.saleorder.entity.Salesorder_item0Entity;
 import jnpf.saleorder.service.SaleorderitemService;
 import jnpf.saleorder.service.Salesorder_item0Service;
+import jnpf.service.ContractService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -92,6 +99,12 @@ public class ArinvoicesController {
     private Salesorder_item0Service salesorder_item0Service;
     @Autowired
     private PoundlistService poundlistService;
+    @Autowired
+    private MaterialService materialService;
+    @Autowired
+    private ContractFileService contractFileService;
+    @Autowired
+    private CustomerService customerService;
 
 
 
@@ -352,11 +365,33 @@ public class ArinvoicesController {
     //子表
 		List<Arinvoices_item1Entity> Arinvoices_item1List = arinvoicesService.GetArinvoices_item1List(id);
 		for(Arinvoices_item1Entity arinvoices_item1Entity : Arinvoices_item1List){
+            MaterialEntity materialEntity = materialService.getById(arinvoices_item1Entity.getMaterialId());
+            if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
+                arinvoices_item1Entity.setMaterialName(materialEntity.getItemName());
+            }
 		}
 		vo.setArinvoices_item1List(JsonUtil.getJsonToList(Arinvoices_item1List,Arinvoices_item1Model.class ));
 		List<Arinvoices_item0Entity> Arinvoices_item0List = arinvoicesService.GetArinvoices_item0List(id);
 		for(Arinvoices_item0Entity arinvoices_item0Entity : Arinvoices_item0List){
 		}
+		if (vo.getSalesOrderId()!=null) {
+            SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(vo.getSalesOrderId());
+            if (ObjectUtils.isNotEmpty(saleorderitemEntity) && StringUtils.isNotEmpty(saleorderitemEntity.getDocumentNo())){
+                vo.setSourceName(saleorderitemEntity.getDocumentNo());
+            }
+        }
+		if (vo.getContractId()!=null){
+		    ContractFileEntity contractEntity = contractFileService.getById(vo.getContractId());
+		    if (ObjectUtils.isNotEmpty(contractEntity) && StringUtils.isNotEmpty(contractEntity.getContractName())){
+		        vo.setContractName(contractEntity.getContractName());
+            }
+        }
+		if (vo.getCustomerId()!=null){
+		    CustomerEntity customerEntity = customerService.getById(vo.getCustomerId());
+		    if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
+		        vo.setCustomerName(customerEntity.getSupplierNm());
+            }
+        }
 		vo.setArinvoices_item0List(JsonUtil.getJsonToList(Arinvoices_item0List,Arinvoices_item0Model.class ));
     //副表
         return ActionResult.success(vo);

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/ArinvoicesInfoVO.java

@@ -79,4 +79,11 @@ public class ArinvoicesInfoVO{
         /** 子表数据 **/
         @JsonProperty("arinvoices_item0List")
         private List<Arinvoices_item0Model> arinvoices_item0List;
+
+        @JsonProperty("sourceName")
+        private String sourceName;
+        @JsonProperty("contractName")
+        private String contractName;
+        @JsonProperty("customerName")
+        private String customerName;
 }

SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/model/arinvoices/Arinvoices_item1Model.java

@@ -55,6 +55,9 @@ public class Arinvoices_item1Model  {
     @JsonProperty("remark")
     private String remark;
 
+    @JsonProperty("materialName")
+    private String materialName;
+
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java

@@ -14,13 +14,19 @@ import jnpf.base.vo.PaginationVO;
 import jnpf.base.UserInfo;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
+import jnpf.customer.entity.CustomerEntity;
+import jnpf.customer.service.CustomerService;
 import jnpf.exception.DataException;
+import jnpf.materialvo.entity.MaterialEntity;
+import jnpf.materialvo.service.MaterialService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.service.PoundlistService;
 import jnpf.saleorder.entity.SaleorderitemEntity;
 import jnpf.saleorder.entity.Salesorder_item0Entity;
 import jnpf.saleorder.service.SaleorderitemService;
 import jnpf.saleorder.service.Salesorder_item0Service;
+import jnpf.vehicle.entity.VehicleEntity;
+import jnpf.vehicle.service.VehicleService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -91,6 +97,12 @@ public class ReceiptoutController {
     private Salesorder_item0Service salesorder_item0Service;
     @Autowired
     private PoundlistService poundlistService;
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private VehicleService vehicleService;
+    @Autowired
+    private MaterialService materialService;
 
     /**
      * 销售订单出货，出库单创建
@@ -367,10 +379,30 @@ public class ReceiptoutController {
             vo.setLastModifyTime(vo.getLastModifyTime());
         }
          vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
+        if (vo.getSourceNo()!=null){
+            SaleorderitemEntity saleorderitemEntity = saleorderitemService.getById(vo.getSourceNo());
+            if (ObjectUtils.isNotEmpty(saleorderitemEntity)){
+                vo.setSourceName(saleorderitemEntity.getDocumentNo());
+                if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
+                    CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
+                    if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())) {
+                        vo.setCustomerName(customerEntity.getSupplierNm());
+                    }
+                }
+            }
+        }
 
     //子表
 		List<Receiptout_item0Entity> Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id);
 		for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){
+		    VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId());
+		    if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){
+		        receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno());
+            }
+		    MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId());
+		    if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
+		        receiptout_item0Entity.setMaterialName(materialEntity.getItemName());
+            }
 		}
 		vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class ));
     //副表

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/ReceiptoutInfoVO.java

@@ -87,5 +87,11 @@ public class ReceiptoutInfoVO{
         @JsonProperty("receiptout_item0List")
         private List<Receiptout_item0Model> receiptout_item0List;
 
+        @JsonProperty("sourceName")
+        private String  sourceName;
+
+        @JsonProperty("customerName")
+        private String  customerName;
+
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java

@@ -66,6 +66,12 @@ public class Receiptout_item0Model  {
     @JsonProperty("poundType")
     private String poundType;
 
+    @JsonProperty("vehicleName")
+    private String vehicleName;
+
+    @JsonProperty("materialName")
+    private String materialName;
+
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java

@@ -263,24 +263,31 @@ public class SaleorderitemController {
     public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
         String[] idList = ids.split(",");
         for (String id : idList) {
-            QueryWrapper<ArinvoicesEntity> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.lambda().eq(ArinvoicesEntity::getSalesOrderId, id);
-            ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper2);
-            if (ObjectUtils.isNotEmpty(arinvoicesEntity)) {
-                QueryWrapper<SaleorderitemEntity> salesqueryWrapper = new QueryWrapper<>();
-                salesqueryWrapper.lambda().eq(SaleorderitemEntity::getId, id);
-                SaleorderitemEntity Entity = saleorderitemService.getOne(salesqueryWrapper);
+            List<ArinvoicesEntity> arinvoicesEntityList = saleorderitemService.queryArinvoicesInfo(id);
+            if (arinvoicesEntityList!=null && arinvoicesEntityList.size()>0) {
+                SaleorderitemEntity Entity = saleorderitemService.getById(id);
                 if (!Entity.getStatus().equals("2")){
                     return ActionResult.fail("数据状态不能发票录入");
                 }
+                ArinvoicesEntity arinvoicesEntity = JsonUtil.getJsonToBean(arinvoicesEntityList.get(0), ArinvoicesEntity.class);
                 QueryWrapper<Arinvoices_item0Entity> queryWrapper3 = new QueryWrapper<>();
                 queryWrapper3.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,arinvoicesEntity.getId());
                 List<Arinvoices_item0Entity> list0 = arinvoices_item0Service.list(queryWrapper3);
                 QueryWrapper<Arinvoices_item1Entity> queryWrapper4 = new QueryWrapper<>();
                 queryWrapper4.lambda().eq(Arinvoices_item1Entity::getArinvoicesId,arinvoicesEntity.getId());
                 List<Arinvoices_item1Entity> list1 = arinvoices_item1Service.list(queryWrapper4);
-                arinvoicesEntity.setArinvoices_item0EntityList(list0);
-                arinvoicesEntity.setArinvoices_item1EntityList(list1);
+                if (list0!=null && list0.size()>0){
+                    arinvoicesEntity.setArinvoices_item0EntityList(list0);
+                }
+                if (list1!=null && list1.size()>0){
+                    for (Arinvoices_item1Entity entity : list1){
+                        MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
+                        if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) {
+                            entity.setMaterialName(materialEntity.getItemName());
+                        }
+                    }
+                    arinvoicesEntity.setArinvoices_item1EntityList(list1);
+                }
                 return ActionResult.success(arinvoicesEntity);
             }else {
                 List<SaleorderitemEntity> list = new ArrayList<>();
@@ -293,12 +300,29 @@ public class SaleorderitemController {
                     queryWrapper1.lambda().eq(Salesorder_item0Entity::getSalesOrderId, saleorderitemEntity.getId());
                     List<Salesorder_item0Entity> dList = salesorder_item0Service.list(queryWrapper1);
                     for (Salesorder_item0Entity entity : dList) {
+                        MaterialEntity materialEntity = materialService.getById(entity.getMaterialId());
+                        if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){
+                            entity.setMaterialName(materialEntity.getItemName());
+                        }
                         QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
                         queryWrapper3.lambda().eq(PoundlistEntity::getId, entity.getPoundlistId());
                         PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
                         entity.setPoundEntity(poundlistEntity);
                     }
+                    if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())) {
+                        ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId());
+                        if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName()));{
+                            saleorderitemEntity.setContractName(contractFileEntity.getContractName());
+                        }
+                    }
+                    if (StringUtils.isNotEmpty(saleorderitemEntity.getCustomerId())){
+                        CustomerEntity customerEntity = customerService.getById(saleorderitemEntity.getCustomerId());
+                        if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
+                            saleorderitemEntity.setCustomerName(customerEntity.getSupplierNm());
+                        }
+                    }
                     saleorderitemEntity.setList(dList);
+                    saleorderitemEntity.setSourceName(saleorderitemEntity.getDocumentNo());
                     saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
                     list.add(saleorderitemEntity);
                     return ActionResult.success(list);

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java

@@ -3,6 +3,7 @@ package jnpf.saleorder.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.model.poundlist.PoundlistPagination;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
@@ -27,5 +28,6 @@ public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
     PoundlistEntity queryPoundlist(String poundlistId);
     List<Salesorder_item0Entity> querySaleOrderItem(String id);
     List<Receiptout_item0Entity> queryReceiptoutItem(String id);
+    List<ArinvoicesEntity> queryArinvoices(String id);
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java

@@ -1,6 +1,7 @@
 package jnpf.saleorder.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.arinvoices.entity.ArinvoicesEntity;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.receiptout.entity.Receiptout_item0Entity;
 import jnpf.saleorder.entity.*;
@@ -45,6 +46,7 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
      List<Salesorder_item0Entity> querySaleOrderItemInfo(String id);
 
      List<Receiptout_item0Entity> queryReceiptoutItemInfo(String id);
+     List<ArinvoicesEntity> queryArinvoicesInfo(String id);
 
     //列表子表数据方法
 }

SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java

@@ -579,6 +579,11 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         return saleorderitemMapper.queryReceiptoutItem(id);
     }
 
+    @Override
+    public List<ArinvoicesEntity> queryArinvoicesInfo(String id) {
+        return saleorderitemMapper.queryArinvoices(id);
+    }
+
     //列表子表数据方法
 
 

SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml

@@ -97,6 +97,24 @@ FROM
         WHERE a.delete_mark = '0'
             and a.receiptin_id = #{id}
     </select>
+    
+    <select id="queryArinvoices" resultType="jnpf.arinvoices.entity.ArinvoicesEntity">
+        SELECT
+            a.*,
+            b.document_no sourceOrderNo,
+            c.contract_name contractNm,
+            d.supplier_nm customerNm
+        FROM
+        	jg_arinvoices a
+        	LEFT JOIN jg_salesorder b ON a.sales_order_id = b.id
+        	AND b.delete_mark = '0'
+        	LEFT JOIN jg_contract c ON a.contract_id = c.id
+        	AND c.delete_mark = '0'
+        	LEFT JOIN jg_customer d ON a.customer_id = d.id
+        	AND d.delete_mark = '0'
+        WHERE a.delete_mark = '0'
+	        AND a.sales_order_id = #{id}
+    </select>
 
 
 </mapper>

SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue

@@ -55,12 +55,15 @@
       <el-col :span="8" >
         <el-form-item  label="合同名称"
                        prop="contractId" >
-          <popupSelect    v-model="dataForm.contractId"
+<!--          <popupSelect    v-model="dataForm.contractId"
                           placeholder="请选择"  clearable  field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.contractName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
@@ -84,24 +87,30 @@
       <el-col :span="8" >
         <el-form-item  label="来源单号"
                        prop="salesOrderId" >
-          <popupSelect    v-model="dataForm.salesOrderId"
+<!--          <popupSelect    v-model="dataForm.salesOrderId"
                           placeholder="请选择"  clearable  field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.sourceName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
 
       <el-col :span="8" >
         <el-form-item  label="客户"
                        prop="customerId" >
-          <popupSelect    v-model="dataForm.customerId"
+<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.customerName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="16" >
@@ -125,11 +134,14 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="materialId" label="物料" align="center" width="180">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.materialId"
+<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.materialName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
             <el-table-column prop="quantity" label="数量" align="center" width="130">

SC-web/src/views/scm/basicInformation/arinvoices/Form.vue

@@ -55,12 +55,15 @@
       <el-col :span="8" >
         <el-form-item  label="合同名称"
                        prop="contractId" >
-          <popupSelect    v-model="dataForm.contractId"
+<!--          <popupSelect    v-model="dataForm.contractId"
                           placeholder="请选择"  clearable  field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.contractName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
@@ -84,24 +87,30 @@
       <el-col :span="8" >
         <el-form-item  label="来源单号"
                        prop="salesOrderId" >
-          <popupSelect    v-model="dataForm.salesOrderId"
+<!--          <popupSelect    v-model="dataForm.salesOrderId"
                           placeholder="请选择"  clearable  field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.sourceName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
 
       <el-col :span="8" >
         <el-form-item  label="客户"
                        prop="customerId" >
-          <popupSelect    v-model="dataForm.customerId"
+<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.customerName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
@@ -125,11 +134,14 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="materialId" label="物料" align="center" width="180">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.materialId"
+<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.materialName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
             <el-table-column prop="quantity" label="数量" align="center" width="130">
@@ -349,6 +361,9 @@
                             salesOrderId : "",
                             contractId : "",
                             customerId : "",
+                            sourceName: "",
+                            contractName: "",
+                            customerName: "",
                         arinvoices_item1List:[],
                         arinvoices_item0List:[],
             },

SC-web/src/views/scm/basicInformation/receiptout/Detail.vue

@@ -28,12 +28,16 @@
             <el-col :span="8" >
                 <el-form-item  label="来源单号"
  prop="sourceNo" >
-                    <popupSelect    v-model="dataForm.sourceNo"
+<!--                    <popupSelect    v-model="dataForm.sourceNo"
  placeholder="请选择"  clearable  field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
  popupTitle="选择数据"  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
 
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input    v-model="dataForm.sourceName"
+                               placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+
+                  </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
@@ -67,11 +71,15 @@
       <el-col :span="8" >
         <el-form-item  label="客户"
                        prop="customerId" >
-          <popupSelect    v-model="dataForm.customerId"
+<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
                           hasPage :pageSize="20"   >
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.customerName"
+                       placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+
+          </el-input>
         </el-form-item>
       </el-col>
             <el-col :span="16" >
@@ -114,20 +122,26 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.vehicleId"
+<!--                    <popupSelect   v-model="scope.row.vehicleId"
  placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.vehicleName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
             <el-table-column prop="materialId" label="物料名称" align="center" width="180">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.materialId"
+<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.materialName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
       <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">

SC-web/src/views/scm/basicInformation/receiptout/Form.vue

@@ -28,12 +28,16 @@
             <el-col :span="8" >
                 <el-form-item  label="来源单号"
  prop="sourceNo" >
-                    <popupSelect    v-model="dataForm.sourceNo"
+<!--                    <popupSelect    v-model="dataForm.sourceNo"
  placeholder="请选择"  clearable  field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
  popupTitle="选择数据"  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
 
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input    v-model="dataForm.sourceName"
+                               placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+
+                  </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8" >
@@ -67,11 +71,15 @@
       <el-col :span="8" >
         <el-form-item  label="客户"
                        prop="customerId" >
-          <popupSelect    v-model="dataForm.customerId"
+<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
                           hasPage :pageSize="20"   >
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.customerName"
+                       placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+
+          </el-input>
         </el-form-item>
       </el-col>
             <el-col :span="16" >
@@ -114,20 +122,26 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.vehicleId"
+<!--                    <popupSelect   v-model="scope.row.vehicleId"
  placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.vehicleName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
             <el-table-column prop="materialId" label="物料名称" align="center" width="180">
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.materialId"
+<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.materialName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
       <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">

SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue

@@ -27,34 +27,43 @@
       <el-col :span="8" >
         <el-form-item  label="销售订单号"
                        prop="salesOrderId" >
-          <popupSelect    v-model="dataForm.salesOrderId"
-                          placeholder="请选择"  clearable  field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
-                          popupTitle="选择数据"  popupWidth="800px" disabled
-          >
+<!--          <popupSelect    v-model="dataForm.salesOrderId"-->
+<!--                          placeholder="请选择"  clearable  field="salesOrderId" interfaceId="400235058386036741" :columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"-->
+<!--                          popupTitle="选择数据"  popupWidth="800px" disabled-->
+<!--          >-->
 
-          </popupSelect>
+<!--          </popupSelect>-->
+          <el-input    v-model="dataForm.sourceName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
         <el-form-item  label="合同名称"
                        prop="contractId" >
-          <popupSelect    v-model="dataForm.contractId"
+<!--          <popupSelect    v-model="dataForm.contractId"
                           placeholder="请选择"  clearable  field="contractId" interfaceId="398361758806411909" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.contractName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
         <el-form-item  label="客户"
                        prop="customerId" >
-          <popupSelect    v-model="dataForm.customerId"
+<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="398362084892576389" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
           >
 
-          </popupSelect>
+          </popupSelect>-->
+          <el-input    v-model="dataForm.customerName"
+                       placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+          </el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8" >
@@ -137,11 +146,14 @@
         <el-table-column type="index" width="50" label="序号" align="center" />
             <el-table-column prop="materialId" label="物料" align="center" >
                 <template slot-scope="scope">
-                    <popupSelect   v-model="scope.row.materialId"
+<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
-                </popupSelect>
+                </popupSelect>-->
+                  <el-input   v-model="scope.row.materialName"
+                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
+                  </el-input>
             </template>
         </el-table-column>
             <el-table-column prop="quantity" label="数量" align="center" >
@@ -542,6 +554,9 @@
 				        this.dataForm.contractId = list[0].contractId;
 				        this.dataForm.customerId = list[0].customerId;
 				        this.dataForm.salesOrderId = list[0].id;
+				        this.dataForm.sourceName = list[0].sourceName;
+				        this.dataForm.contractName = list[0].contractName;
+				        this.dataForm.customerName = list[0].customerName;
                 this.dataForm.arinvoices_item1List = list[0].list;
                 for (let i = 0;i<list[0].list.length;i++){
                   this.dataForm.arinvoices_item1List[i].quantity = list[0].list[i].settlement;
@@ -565,6 +580,9 @@
           init2(list2) {
             this.visible = true;
             this.dataForm = list2
+            this.dataForm.sourceName = list2.sourceOrderNo;
+            this.dataForm.contractName = list2.contractNm;
+            this.dataForm.customerName = list2.customerNm;
             this.dataForm.businessDate = new Date().getTime();
             this.dataForm.arinvoices_item1List = list2.arinvoices_item1EntityList;
             this.dataForm.arinvoices_item0List = list2.arinvoices_item0EntityList;
@@ -655,7 +673,7 @@
                             invoiceStatus:'0',
                             creatorUserName:undefined,
                             invoiceDate:new Date().getTime(),
-                            attachMent:undefined,
+                            attachMent:[],
                 }
                     this.dataForm.arinvoices_item0List.push(item)
                 },