Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@@ -6,8 +6,8 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存
-          </el-button>
+<!--          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存-->
+<!--          </el-button>-->
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">确认
           </el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!--列表页面-->
     <div v-show="viewState == 1">
-      <button-bar view-title="消贷合同列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar view-title="还款计划表管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <!--Start查询列表部分-->
       <div class="main-content">
         <div class="searchcon">
@@ -52,7 +52,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">消贷合同列表</div>
+          <div class="tit">还款计划表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->

yxt-as-ui/src/api/storage/deliveryNotice.js

@@ -25,7 +25,7 @@ export default {
   // 收货初始化
   getInitDetails: function(data) {
     return request({
-      url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourcesid=' + data,
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getInitDetails?sourceSid=' + data,
       method: 'get'
     });
   },
@@ -58,9 +58,11 @@ export default {
   // 选择供应商
   choiceSupplier: function(params) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
+      url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo?orgSid=' + params,
       method: 'post',
-      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 

yxt-as-ui/src/api/storage/receivingGoods.js

@@ -8,16 +8,17 @@ export default {
       url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
       method: 'post',
       data: params,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
   // 初始化
   init: function(data) {
     return request({
-      url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit',
-      method: 'get',
-      data: data
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sourceSid=' + data,
+      method: 'get'
     });
   },
 
@@ -28,7 +29,9 @@ export default {
       url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
@@ -38,7 +41,9 @@ export default {
       url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
@@ -49,7 +54,9 @@ export default {
       url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
       method: 'post',
       data: data,
-      headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     });
   },
 
@@ -60,16 +67,20 @@ export default {
       url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
       method: 'post',
       data: params,
-       headers: { 'Content-Type': 'application/json' }
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
   // 选择供应商
   choiceSupplier: function(params) {
     return request({
-      url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
+      url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo?orgSid=' + params,
       method: 'post',
-      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 

yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@@ -46,8 +46,9 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">供应商</div>
-            <el-select v-model="scope.row.supplierName" placeholder="请选择" clearable @change="selectSupplierName">
-              <el-option v-for="(item,i) in supplierNameList" :key="i" :label="item.warehouseName" :value="item.sid">
+            <el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
+              class="addinputInfo">
+              <el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName" :value="item.sid">
               </el-option>
             </el-select>
 
@@ -202,6 +203,9 @@
 <script>
   import req from '@/api/storage/deliveryNotice.js'
   import req2 from '@/api/storage/allocation.js'
+  import {
+    getOrgSidByPath
+  } from '@/api/Common/dictcommons'
 
   export default {
     components: {},
@@ -236,7 +240,7 @@
     },
     created() {},
     methods: {
-      supplierNameSelect(val) {
+      selectSupplierName(val) {
 
         console.log("supplierNameSelect", val);
         const choose = this.supplierNameList.filter((item) => item.sid == val)
@@ -246,17 +250,23 @@
 
       },
       getsupplierLust() {
-        var params = {
-          orgSid: window.sessionStorage.getItem('orgSid'),
-        }
-        req.choiceSupplier(params).then((res) => {
-          if (res.success) {
-            this.supplierNameList = res.data
 
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+            if (res.success) {
+              this.formobj.createOrgSid = res.data
+              this.formobj.useOrgSid = res.data
+              req.choiceSupplier(res.data).then((resp) => {
+              if (resp.success) {
+                this.supplierNameList = resp.data
                 console.log("aaaaaa", this.supplierNameList);
+              }
+            })
 
           }
         })
+
     },
     getWarehouseList() {
       req2.getWarehouses().then((res) => {

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -779,10 +779,10 @@
         this.getWarehouseList()
         console.log("showEdit", this.isUpdata);
         var params = {
-          sid: row.sid
+          sourcesid: row.sid
         }
 
-        req.init(params)
+        req.init( row.sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data
@@ -810,9 +810,9 @@
       },
       getsupplierLust() {
        var params = {
-         createOrgSid: window.sessionStorage.getItem('orgSid'),
+         orgSid: window.sessionStorage.getItem('orgSid'),
        }
-        req.choiceSupplier(params).then((res) => {
+        req.choiceSupplier(window.sessionStorage.getItem('orgSid')).then((res) => {
           if (res.success) {
             this.supplierList = res.data
 

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue

@@ -173,7 +173,7 @@
         var params = {
           sid: row.sid
         }
-        req.init(params)
+        req.init(row.sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data

yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue

@@ -227,7 +227,7 @@
           sid: row.sid
         }
 
-        req.init(params)
+        req.init(row.sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java

@@ -24,7 +24,7 @@ public class WmsAnsBill extends BaseEntity {
     private String busTypeValue;
     @ApiModelProperty("制单人姓名")
     private String createByName;
-    @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
+    @ApiModelProperty("货物状态")
     private Integer billState;
     @ApiModelProperty("审核状态（待审核、审核通过、审核拒绝）")
     private String reviewStatus;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml

@@ -20,7 +20,7 @@
                wab.contact,
                wab.mobile,
                DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               wab.billState,
+               case wab.billState when 0 then '新建' when 1 then '完成' end as billState,
                wab.reviewStatus,
                wab.refuseReason
         from wms_ans_bill wab

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml

@@ -11,6 +11,7 @@
         select wd.goodsSkuTitle,
                wd.goodsSkuCode,
                wd.goodsSkuOwnSpec,
+               wd.goodsSpuName,
                wd.unit,
                wd.orderCount,
                wd.waitInCount,

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java

@@ -13,7 +13,8 @@ import java.math.BigDecimal;
 @Data
 public class WmsAnsListDetailsVo {
     @ApiModelProperty("商品名称")
-    private String goodsSkuTitle;
+//    private String goodsSkuTitle;
+    private String goodsSpuName;
     @ApiModelProperty("商品编码（图号）")
     private String goodsSkuCode;
     @ApiModelProperty("规格型号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -145,9 +145,16 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo();
         WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
         BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid");
-        wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
+        wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getSourceBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
+        if (wmsAnsBill.getBillState() == 0) {
+            wmsReceiptBillVo.setBillStateKey("0");
+            wmsReceiptBillVo.setBillState("新建");
+        } else {
+            wmsReceiptBillVo.setBillState("完成");
+            wmsReceiptBillVo.setBillStateKey("1");
+        }
         List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java

@@ -39,8 +39,9 @@ public class WmsReceiptBillVo {
     @ApiModelProperty("到货日期")
     private Date deliveryDate;
     //单据状态：新建/已完成
-    @ApiModelProperty("单据状态：待收货/部分收货/已收货(默认)")
+    @ApiModelProperty("单据状态")
     private String billState;
+    private String billStateKey;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("使用组织sid")