Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue

@@ -121,7 +121,7 @@
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="price" label="销售单价" align="center" width="150" />
             <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />

yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue

@@ -132,7 +132,7 @@
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="price" label="销售单价" align="center" width="150" />
             <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue

@@ -117,7 +117,7 @@
           "deptSid": "",
           "remarks": "",
           "createBySid": "",
-          "createTime": getCurrentDate(),
+          "createTime": "",
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentEdit.vue

@@ -76,9 +76,6 @@
   } from '@/utils/index.js'
   import choosecategory from './relation/choosecategory'
   import editPriceStrategy from './relation/editPriceStrategy'
-  import {
-    getOrgSidByPath
-  } from '@/api/Common/dictcommons'
   export default {
     components: {
       choosecategory,
@@ -98,7 +95,7 @@
           "deptSid": "",
           "remarks": "",
           "createBySid": "",
-          "createTime": getCurrentDate(),
+          "createTime": "",
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",

yxt-as-ui/src/views/workFlow/adjustmentFlow/adjustmentYiBan.vue

@@ -71,7 +71,7 @@
           "deptSid": "",
           "remarks": "",
           "createBySid": "",
-          "createTime": getCurrentDate(),
+          "createTime": "",
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue

@@ -135,7 +135,7 @@
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="price" label="销售单价" align="center" width="150" />
             <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue

@@ -120,7 +120,7 @@
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="price" label="销售单价" align="center" width="150" />
             <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue

@@ -132,7 +132,7 @@
             <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
             <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
             <el-table-column prop="count" label="数量" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="price" label="销售单价" align="center" width="150" />
             <el-table-column prop="goodsReceivableAmount" label="应收金额" align="center" width="150" />
             <el-table-column prop="discount" label="折扣" align="center" width="100" />
             <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />