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 type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存-->
-          </el-button>
+<!--          </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',
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sourceSid=' + data,
-      method: 'get',
+      method: 'get'
-      data: data
     });
   },
 
@@ -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) {
+  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-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
-              <el-option v-for="(item,i) in supplierNameList" :key="i" :label="item.warehouseName" :value="item.sid">
+              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,425 +250,431 @@
 
       },
       getsupplierLust() {
-        var params = {
-          orgSid: window.sessionStorage.getItem('orgSid'),
-        }
-        req.choiceSupplier(params).then((res) => {
-          if (res.success) {
-            this.supplierNameList = res.data
 
-            console.log("aaaaaa", this.supplierNameList);
+        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) => {
-          if (res.success) {
-            this.warehouseList = res.data
 
-            console.log("aaaaaa", this.warehouseList);
+    },
+    getWarehouseList() {
+      req2.getWarehouses().then((res) => {
+        if (res.success) {
+          this.warehouseList = res.data
+
+          console.log("aaaaaa", this.warehouseList);
 
-          }
-        })
-      },
-      getWarehouseAreaList(sid) {
-        var query = {
-          ckSid: sid
         }
-        req2.getWarehouseareas(query).then((res) => {
+      })
-          if (res.success) {
+    },
-            this.warehouseRackList = res.data
+    getWarehouseAreaList(sid) {
+      var query = {
+        ckSid: sid
+      }
+      req2.getWarehouseareas(query).then((res) => {
+        if (res.success) {
+          this.warehouseRackList = res.data
 
-            console.log("aaaaaa", this.warehouseRackList);
+          console.log("aaaaaa", this.warehouseRackList);
 
-          }
+        }
-        })
+      })
-      },
+    },
-      selectWarehouseName(row, val) {
+    selectWarehouseName(row, val) {
-        console.log("selectWarehouseName", row);
+      console.log("selectWarehouseName", row);
-        console.log("selectWarehouseName", val);
+      console.log("selectWarehouseName", val);
-        const choose = this.warehouseList.filter((item) => item.sid == val)
+      const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseName', choose)
+      console.log('>>>>>>>>>selectWarehouseName', choose)
-        row.warehouseName = choose[0].warehouseName
+      row.warehouseName = choose[0].warehouseName
-        row.warehouseSid = choose[0].sid
+      row.warehouseSid = choose[0].sid
 
-      },
+    },
-      selectWarehouseAreaCode(val) {
+    selectWarehouseAreaCode(val) {
-        console.log("selectWarehouseAreaCode", val);
+      console.log("selectWarehouseAreaCode", val);
 
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+      const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+      console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
-        row.warehouseRackName = choose[0].areaCode
+      row.warehouseRackName = choose[0].areaCode
-        row.warehouseRackSid = choose[0].sid
+      row.warehouseRackSid = choose[0].sid
 
-      },
+    },
 
-      batchAddAll() {
+    batchAddAll() {
-
-        for (var i = 0; i < this.formobj.list.length; i++) {
-          var item = this.formobj.list[i]
-
-          var info = {
-            xh: i + 1,
-            goodsSkuSid: item.goodsSkuSid,
-            goodsSkuTitle: item.goodsSkuTitle,
-            goodsSkuCode: item.goodsSkuCode,
-            goodsSkuOwnSpec: item.goodsSkuOwnSpec,
-            unit: item.unit,
-            warehouseSid: item.warehouseSid,
-            warehouseName: item.warehouseName,
-            warehouseRackSid: item.warehouseRackSid,
-            warehouseRackName: item.warehouseRackName,
-            shelfLife: item.shelfLife,
-            orderCount: item.orderCount,
-            batchNumber: '',
-            manufactureDate: '',
-            batchCount: 0,
-          }
 
-          this.formobj.pcList.push(info)
+      for (var i = 0; i < this.formobj.list.length; i++) {
+        var item = this.formobj.list[i]
 
+        var info = {
+          xh: i + 1,
+          goodsSkuSid: item.goodsSkuSid,
+          goodsSkuTitle: item.goodsSkuTitle,
+          goodsSkuCode: item.goodsSkuCode,
+          goodsSkuOwnSpec: item.goodsSkuOwnSpec,
+          unit: item.unit,
+          warehouseSid: item.warehouseSid,
+          warehouseName: item.warehouseName,
+          warehouseRackSid: item.warehouseRackSid,
+          warehouseRackName: item.warehouseRackName,
+          shelfLife: item.shelfLife,
+          orderCount: item.orderCount,
+          batchNumber: '',
+          manufactureDate: '',
+          batchCount: 0,
         }
 
-      },
+        this.formobj.pcList.push(info)
-      doGoods(row) {
+
-        console.log("doGoodsDel》》》》", row)
+      }
-
+
-        this.$confirm("是否确定删除此商品？", '提示', {
+    },
-          confirmButtonText: '确定',
+    doGoods(row) {
-          cancelButtonText: '取消',
+      console.log("doGoodsDel》》》》", row)
-          type: 'warning'
+
-        }).then(() => {
+      this.$confirm("是否确定删除此商品？", '提示', {
-          const index = this.formobj.list.findIndex((item) => item === row)
+        confirmButtonText: '确定',
-          console.log("index》》》》", index)
+        cancelButtonText: '取消',
-          this.formobj.list.splice(index, 1)
+        type: 'warning'
-
+      }).then(() => {
-          for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+        const index = this.formobj.list.findIndex((item) => item === row)
-            if (this.formobj.pcList[i].xh === (index + 1)) {
+        console.log("index》》》》", index)
-              this.formobj.pcList.splice(i, 1);
+        this.formobj.list.splice(index, 1)
-            }
+
+        for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
+          if (this.formobj.pcList[i].xh === (index + 1)) {
+            this.formobj.pcList.splice(i, 1);
           }
+        }
 
-        })
+      })
-      },
+    },
 
-      doGoodsBatch(row) {
+    doGoodsBatch(row) {
-        console.log("doGoodsDel》》》》", row)
+      console.log("doGoodsDel》》》》", row)
 
-        this.$confirm("是否确定删除此商品？", '提示', {
+      this.$confirm("是否确定删除此商品？", '提示', {
-          confirmButtonText: '确定',
+        confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        cancelButtonText: '取消',
-          type: 'warning'
+        type: 'warning'
-        }).then(() => {
+      }).then(() => {
-          const index = this.formobj.pcList.findIndex((item) => item === row)
+        const index = this.formobj.pcList.findIndex((item) => item === row)
-          console.log("index》》》》", index)
+        console.log("index》》》》", index)
-          this.formobj.pcList.splice(index, 1)
+        this.formobj.pcList.splice(index, 1)
 
-        })
+      })
 
-      },
+    },
 
-      manufactureDateChange(row, val) {
+    manufactureDateChange(row, val) {
 
-        console.log("manufactureDateChange》》》》", val)
+      console.log("manufactureDateChange》》》》", val)
 
-        row.manufactureDate = val
+      row.manufactureDate = val
-        row.expirationDate = this.addDate(val, row.shelfLife)
+      row.expirationDate = this.addDate(val, row.shelfLife)
 
-        let reg = new RegExp('-', 'g') //g代表全部
+      let reg = new RegExp('-', 'g') //g代表全部
 
-        row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
+      row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
 
 
 
-        this.$forceUpdate(); // 强制更新
+      this.$forceUpdate(); // 强制更新
-        console.log("manufactureDateChange》》》》", row)
+      console.log("manufactureDateChange》》》》", row)
 
-      },
+    },
 
-      addDate(date, days) {
+    addDate(date, days) {
-        var dates = new Date(date)
+      var dates = new Date(date)
-        dates.setDate(dates.getDate() + days)
+      dates.setDate(dates.getDate() + days)
-        var year = dates.getFullYear()
+      var year = dates.getFullYear()
-        var month = dates.getMonth() + 1
+      var month = dates.getMonth() + 1
-        var day = dates.getDate()
+      var day = dates.getDate()
-        if (month < 9) {
+      if (month < 9) {
-          month = "0" + month
+        month = "0" + month
-        }
+      }
-        if (day < 9) {
+      if (day < 9) {
-          day = "0" + day
+        day = "0" + day
-        }
+      }
-        var time = year + '-' + month + '-' + day
+      var time = year + '-' + month + '-' + day
-        return time
+      return time
-      },
+    },
 
-      doAddBatch(row) {
+    doAddBatch(row) {
-        const index = (this.formobj.list.findIndex((item) => item === row)) + 1
+      const index = (this.formobj.list.findIndex((item) => item === row)) + 1
-        console.log("doAddBatch》》》》", index)
+      console.log("doAddBatch》》》》", index)
-        console.log("doAddBatch》》》》", row)
+      console.log("doAddBatch》》》》", row)
+
+      var info = {
+        xh: index,
+        goodsSkuSid: row.goodsSkuSid,
+        goodsSkuTitle: row.goodsSkuTitle,
+        goodsSkuCode: row.goodsSkuCode,
+        goodsSkuOwnSpec: row.goodsSkuOwnSpec,
+        unit: row.unit,
+        warehouseSid: row.warehouseSid,
+        warehouseName: row.warehouseName,
+        warehouseRackSid: row.warehouseRackSid,
+        warehouseRackName: row.warehouseRackName,
+        shelfLife: row.shelfLife,
+        orderCount: row.orderCount,
+        batchNumber: '',
+        manufactureDate: '',
+        batchCount: 0,
+      }
 
-        var info = {
+      console.log("aaaaaaaaaaa", info);
-          xh: index,
-          goodsSkuSid: row.goodsSkuSid,
-          goodsSkuTitle: row.goodsSkuTitle,
-          goodsSkuCode: row.goodsSkuCode,
-          goodsSkuOwnSpec: row.goodsSkuOwnSpec,
-          unit: row.unit,
-          warehouseSid: row.warehouseSid,
-          warehouseName: row.warehouseName,
-          warehouseRackSid: row.warehouseRackSid,
-          warehouseRackName: row.warehouseRackName,
-          shelfLife: row.shelfLife,
-          orderCount: row.orderCount,
-          batchNumber: '',
-          manufactureDate: '',
-          batchCount: 0,
-        }
 
-        console.log("aaaaaaaaaaa", info);
+      this.formobj.pcList.push(info)
 
-        this.formobj.pcList.push(info)
+    },
+    commodityComputeYHAndXSJE(row, val) {
+      console.log("aaa", row);
+      console.log("aaa", val);
 
-      },
+      if (Number(row.actualInCount) > Number(row.orderCount)) {
-      commodityComputeYHAndXSJE(row, val) {
+        row.actualInCount = row.orderCount
-        console.log("aaa", row);
+      }
-        console.log("aaa", val);
 
-        if (Number(row.actualInCount) > Number(row.orderCount)) {
+    },
-          row.actualInCount = row.orderCount
-        }
 
-      },
+    commodityComputeYHAndXSJE2(row, val) {
+      console.log("aaa", row);
+      console.log("aaa", val);
 
-      commodityComputeYHAndXSJE2(row, val) {
+      if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
-        console.log("aaa", row);
+        row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
-        console.log("aaa", val);
+      }
 
-        if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
+    },
-          row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
-        }
 
-      },
+    changeTheme() {
 
-      changeTheme() {
+    },
 
-      },
+    changeTheme2() {
+
+    },
 
-      changeTheme2() {
 
-      },
+    indexMethod(index) {
+      return index + 1
+    },
+    saveOrUpdate() {
+      console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+      if (this.formobj.deliveryDate == '') {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '到货日期不能为空'
+        })
 
+        return
+      }
 
-      indexMethod(index) {
-        return index + 1
-      },
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
 
-        if (this.formobj.deliveryDate == '') {
+      for (var i = 0; i < this.formobj.pcList.length; i++) {
+        var item = this.formobj.pcList[i]
+
+        if (item.manufactureDate == '') {
           this.$message({
             showClose: true,
             type: 'error',
-            message: '到货日期不能为空'
+            message: '生产日期不能为空'
           })
 
           return
         }
 
+        if (Number(item.batchCount) == 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '商品批次数量不能为0'
+          })
 
-        for (var i = 0; i < this.formobj.pcList.length; i++) {
+          return
-          var item = this.formobj.pcList[i]
-
-          if (item.manufactureDate == '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '生产日期不能为空'
-            })
-
-            return
-          }
-
-          if (Number(item.batchCount) == 0) {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '商品批次数量不能为0'
-            })
-
-            return
-          }
-
         }
 
+      }
 
-        for (var i = 0; i < this.formobj.list.length; i++) {
-          var index = i
-          var num = 0
-          const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
-          for (var j = 0; j < choose.length; j++) {
-
-            num += Number(choose[j].batchCount)
 
-          }
+      for (var i = 0; i < this.formobj.list.length; i++) {
+        var index = i
+        var num = 0
+        const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
+        for (var j = 0; j < choose.length; j++) {
 
-          console.log('>>>>>>>>>saveOrUpdate', num)
+          num += Number(choose[j].batchCount)
 
-          if (num > Number(this.formobj.list[i].actualInCount)) {
+        }
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '商品批次数量不能大于商品实收数量'
-            })
 
-            return
+        console.log('>>>>>>>>>saveOrUpdate', num)
-          }
 
+        if (num > Number(this.formobj.list[i].actualInCount)) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '商品批次数量不能大于商品实收数量'
+          })
 
+          return
         }
 
 
-        this.$refs['form_obj'].validate((valid) => {
+      }
-          if (valid) {
-            this.submitdisabled = true
-            req.save(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          }
-        })
-      },
-      submintdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
 
-        for (var i = 0; i < this.formobj.pcList.length; i++) {
-          var item = this.formobj.pcList[i]
 
-          if (item.manufactureDate == '') {
+      this.$refs['form_obj'].validate((valid) => {
-            this.$message({
+        if (valid) {
-              showClose: true,
+          this.submitdisabled = true
-              type: 'error',
+          req.save(this.formobj).then((res) => {
-              message: '生产日期不能为空'
+            if (res.success) {
-            })
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submintdate() {
+      console.log('>>>>>>>>>saveOrUpdate', this.formobj)
 
-            return
-          }
 
-          if (Number(item.batchCount) == 0) {
+      for (var i = 0; i < this.formobj.pcList.length; i++) {
-            this.$message({
+        var item = this.formobj.pcList[i]
-              showClose: true,
-              type: 'error',
-              message: '商品批次数量不能为0'
-            })
 
-            return
+        if (item.manufactureDate == '') {
-          }
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '生产日期不能为空'
+          })
 
+          return
         }
 
+        if (Number(item.batchCount) == 0) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '商品批次数量不能为0'
+          })
 
-        for (var i = 0; i < this.formobj.list.length; i++) {
+          return
-          var index = i
+        }
-          var num = 0
-          const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
-          for (var j = 0; j < choose.length; j++) {
 
-            num += Number(choose[j].batchCount)
+      }
 
-          }
 
-          console.log('>>>>>>>>>saveOrUpdate', num)
+      for (var i = 0; i < this.formobj.list.length; i++) {
+        var index = i
+        var num = 0
+        const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
+        for (var j = 0; j < choose.length; j++) {
 
-          if (num > Number(this.formobj.list[i].actualInCount)) {
+          num += Number(choose[j].batchCount)
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '商品批次数量不能大于商品实收数量'
-            })
 
-            return
+        }
-          }
 
+        console.log('>>>>>>>>>saveOrUpdate', num)
 
-        }
+        if (num > Number(this.formobj.list[i].actualInCount)) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '商品批次数量不能大于商品实收数量'
+          })
 
-        this.$refs['form_obj'].validate((valid) => {
+          return
-          if (valid) {
-            this.submitdisabled = true
-            req.submit(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          }
-        })
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          sourceBillNo: "",
-          busTypeKey: "",
-          busTypeValue: "",
-          createByName: "",
-          billState: 0,
-          reviewStatus: "",
-          refuseReason: "",
-          contact: "",
-          mobile: "",
-          supplierSid: "",
-          supplierName: "",
-          goodsOwnerSid: "",
-          goodsOwner: "",
-          deliveryDate: "",
-          list: [],
-          pcList: []
         }
-        this.$emit('doback')
-      },
 
-      showAdd() {
 
-      },
+      }
-      showEdit(row) {
-        this.getWarehouseList()
-        this.getsupplierLust()
-        var params = {
-          sourceSid: row.sid
-        }
 
-        req.getInitDetails(row.sid)
+      this.$refs['form_obj'].validate((valid) => {
-          .then(resp => {
+        if (valid) {
-            if (resp.success) {
+          this.submitdisabled = true
-              this.formobj = resp.data
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
-          .catch(e => {
+        }
-            this.formobj = {}
+      })
-          })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sourceBillNo: "",
+        busTypeKey: "",
+        busTypeValue: "",
+        createByName: "",
+        billState: 0,
+        reviewStatus: "",
+        refuseReason: "",
+        contact: "",
+        mobile: "",
+        supplierSid: "",
+        supplierName: "",
+        goodsOwnerSid: "",
+        goodsOwner: "",
+        deliveryDate: "",
+        list: [],
+        pcList: []
+      }
+      this.$emit('doback')
+    },
+
+    showAdd() {
+
+    },
+    showEdit(row) {
+      this.getWarehouseList()
+      this.getsupplierLust()
+      var params = {
+        sourceSid: row.sid
       }
+
+      req.getInitDetails(row.sid)
+        .then(resp => {
+          if (resp.success) {
+            this.formobj = resp.data
+          }
+        })
+        .catch(e => {
+          this.formobj = {}
+        })
     }
   }
+  }
 </script>
 <style scoped>
   .span-sty {

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")