Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue

@@ -135,7 +135,7 @@
                   <el-button type="primary" size="small" @click="goodsReturn(scope.row, scope.$index)">退</el-button>
                 </template>
               </el-table-column>
-              <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" width="300" />
+              <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
@@ -186,7 +186,7 @@
                   <el-button type="danger" size="mini" @click="goodsDelete(scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
-              <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" width="300" />
+              <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
@@ -325,7 +325,7 @@ export default {
       let clf = '0'
       if (this.formobj.returnGoods.length > 0) {
         this.formobj.returnGoods.forEach((e) => {
-          if (e.goodsSkuTitle !== '') {
+          if (e.goodsSpuName !== '') {
             clf = Math.round((parseFloat(clf) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
           }
         })
@@ -509,7 +509,7 @@ export default {
         goodSpuSid: row.sid,
         goodsSpuName: row.goodsSpuName,
         goodsSkuSid: row.goodsSkuSid,
-        goodsSkuTitle: row.goodsSkuTitle,
+        goodsSkuTitle: row.goodsSpuName,
         goodsSkuCode: row.goodsSkuCode,
         unit: row.unit,
         goodsSkuOwnSpec: row.goodsSkuOwnSpec,
@@ -532,7 +532,7 @@ export default {
     fullyWithdraw() {
       if (this.formobj.returnGoods.length > 0) {
         this.formobj.returnGoods.forEach((e) => {
-          if (e.goodsSkuTitle !== '') {
+          if (e.goodsSpuName !== '') {
             // 计算退货数量 = 总数量 - 已退数量
             e.backCount = Math.round((parseFloat(e.currentCount) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100
             // 计算退货金额
@@ -546,7 +546,7 @@ export default {
     },
     // 计算退货金额
     backAmountInput(row) {
-      if (row.goodsSkuTitle !== '') {
+      if (row.goodsSpuName !== '') {
         row.backAmount = Math.round((parseFloat(row.backPrice !== '' ? row.backPrice : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
       }
     },

yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue

@@ -123,7 +123,7 @@
             </div>
             <el-table :key="tableKey" :data="formobj.returnGoods" :index="index" border style="width: 100%">
               <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-              <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" width="300" />
+              <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />

yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@@ -114,14 +114,14 @@
                 <el-popover placement="right" trigger="click"  width="500">
                   <div>
                     <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)">
-                      <el-table-column fixed prop="goodsSkuTitle" label="商品名称" align="center" />
+                      <el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
                       <el-table-column prop="goodsSkuCode" label="图号" align="center" />
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
                       <el-table-column prop="unit" label="单位" align="center" />
                     </el-table>
                     <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, pager" :total="commodityQuery.total" />
                   </div>
-                  <el-input slot="reference" v-model="scope.row.goodsSkuTitle" @input="commodityInput(scope.row.goodsSkuTitle)" clearable placeholder="商品名称"/>
+                  <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/>
                 </el-popover>
               </template>
             </el-table-column>
@@ -390,7 +390,7 @@ export default {
       let clf = '0'
       if (this.formobj.goodsVos.length > 0) {
         this.formobj.goodsVos.forEach((e) => {
-          if (e.goodsSkuTitle !== '') {
+          if (e.goodsSpuName !== '') {
             clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100
           }
         })
@@ -657,7 +657,7 @@ export default {
       row.goodsSkuSid = value.goodsSkuSid
       row.goodsSpuName = value.goodsSpuName
       row.goodsSkuCode = value.goodsSkuCode
-      row.goodsSkuTitle = value.goodsSkuTitle
+      row.goodsSkuTitle = value.goodsSpuName
       row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
       row.unit = value.unit
       row.warehouseName = value.warehouseName

yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue

@@ -80,7 +80,7 @@
           <div class="title">商品列表</div>
           <el-table :key="commodityKey" :data="formobj.goodsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="goodsSkuTitle" label="商品名称" width="200" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" width="200" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
             <el-table-column prop="unit" label="单位" width="100" align="center" />
@@ -202,7 +202,7 @@ export default {
       let clf = '0'
       if (this.formobj.goodsVos.length > 0) {
         this.formobj.goodsVos.forEach((e) => {
-          if (e.goodsSkuTitle !== '') {
+          if (e.goodsSpuName !== '') {
             clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100
           }
         })