Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/BIZComponents/inventoryTable.vue

@@ -208,6 +208,9 @@
       <template v-slot:headerTotalCount="{ column }">
         <span :class="{ 'is-required': isTotalCount }">{{ column.label }}</span>
       </template>
+      <template v-slot:headerTaxRate="{ column }">
+        <span :class="{ 'is-required': isTaxRate == 1 }">{{ column.label }}</span>
+      </template>
       <template v-slot:totalPrice="scope">
         <el-form-item :prop="'datasource.' + scope.$index + '.totalPrice'">
           {{ (Number(scope.row.totalPrice) || 0).toFixed(2) }}元
@@ -333,7 +336,14 @@
       </template> -->
 
       <template v-slot:taxRate="scope">
-        <el-form-item :prop="'datasource.' + scope.$index + '.taxRate'">
+        <el-form-item 
+          :prop="'datasource.' + scope.$index + '.taxRate'"
+          :rules="{
+            required: isTaxRate == 1 ? true : false,
+            message: '请输入税率',
+            trigger: 'change'
+          }"
+        >
           <el-input
             v-model="scope.row.taxRate"
             placeholder="请输入"
@@ -918,10 +928,15 @@
         type: Boolean,
         default: false
       },
-      defTaxRate: {
+      // 是否税率必填
+      isTaxRate: {
         type: Number,
         default: 0
       },
+      defTaxRate: {
+        type: Number,
+        default: undefined
+      },
       countObj: {
         type: Object,
         default: () => {
@@ -1143,7 +1158,8 @@
             prop: 'taxRate',
             label: '税率',
             slot: 'taxRate',
-            align: 'center'
+            align: 'center',
+            headerSlot: 'headerTaxRate',
           },
           {
             width: 180,

src/BIZComponents/outdetails.vue

@@ -609,8 +609,11 @@
           return { dictCode: item.id, dictValue: item.name };
         });
       },
-      async _getInfo(sourceBizNo, type, list = []) {
-        const dataArray = await getInfoBySourceBizNoAll(sourceBizNo);
+      async _getInfo(sourceBizNo, type, list = [], returnSourceType) {
+        const params = {
+          isCreateReturnOrder: 1,
+        }
+        const dataArray = await getInfoBySourceBizNoAll(sourceBizNo, returnSourceType === 3 ? params : {});
         let res = {};
 
         if (dataArray && dataArray.length > 0) {

src/api/wms/index.js

@@ -167,9 +167,9 @@ export async function getInfoBySourceBizNoAPI(sourceBizNo) {
 }
 // 查询出入库详情
 //sourceBizNo
-export async function getInfoBySourceBizNoAll(sourceBizNo) {
+export async function getInfoBySourceBizNoAll(sourceBizNo, data = {}) {
   const res = await request.get(
-    `/wms/outintwo/getInfoBySourceBizNoAll/${sourceBizNo}`, {}
+    `/wms/outintwo/getInfoBySourceBizNoAll/${sourceBizNo}`, {params: data}
   );
   if (res.data.code == 0) {
     return res.data.data;

src/components/upload/exportButton.vue

@@ -4,7 +4,7 @@
     size="small"
     icon="el-icon-download"
     @click="exportFn"
-    >导出</el-button
+    >{{btnName}}</el-button
   >
 </template>
 
@@ -12,6 +12,10 @@
   import { exportTable } from '@/api/system/file/index.js';
   export default {
     props: {
+      btnName: {
+        type: String,
+        default: '导出'
+      },
       apiUrl: '',
       fileName: '',
       params: {

src/views/purchasingManage/purchaseOrder/invoice/index.vue

@@ -276,7 +276,7 @@
           },
           {
             prop: 'productCount',
-            label: '数量',
+            label: '订单数量',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 140

src/views/saleManage/businessOpportunity/components/addFollowDialog.vue

@@ -40,6 +40,9 @@
           <el-date-picker
             v-model="form.followupTime"
             value-format="yyyy-MM-dd HH:mm:ss"
+            :picker-options="{
+              disabledDate: (time) => time.getTime() > Date.now()
+            }"
             placeholder="结束时间"
             type="datetime"
             style="width: 100%"

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -361,8 +361,8 @@
         :isArrivalWay="true"
         :cacheKeyUrl="cacheKeyUrl"
         :isGoods="true"
+        :isTaxRate="isTaxRate"
         :isSinglePrice="form.needProduce != 2"
-        :defTaxRate="13"
         :isBatchNo="isBatchNo == 1 && form.saleTypeName.includes('受托')"
       ></inventoryTable>
       <headerTitle
@@ -713,7 +713,8 @@
         isUpdate: false,
         enterprisePage: [],
         businessId: '',
-        isBatchNo: 0
+        isBatchNo: 0,
+        isTaxRate: 0
       };
     },
     computed: {
@@ -797,6 +798,12 @@
       }).then((res) => {
         this.isBatchNo = res.value;
       });
+
+      parameterGetByCode({
+        code: 'eom_saleOrder_order-taxRate'
+      }).then((res) => {
+        this.isTaxRate = res.value;
+      });
     },
     methods: {
       setCountAmount(allPrice) {

src/views/saleManage/saleOrder/invoice/index.vue

@@ -86,6 +86,7 @@
               </el-dropdown-menu>
             </el-dropdown>
             <exportButton
+              btnName="列表导出"
               fileName="销售发货单"
               apiUrl="/eom/saleordersendrecord/export"
               :params="params"

src/views/saleManage/saleOrder/returnGoods/components/outboundDetailsDialog.vue

@@ -53,7 +53,7 @@ export default {
     async init(row = {},list=[]) {
         this.$nextTick(()=>{
           console.log(row)
-          this.$refs.outboundDetailsDialogRef._getInfo(row.sendNo,row.type,list)
+          this.$refs.outboundDetailsDialogRef._getInfo(row.sendNo,row.type,list, row.returnSourceType)
         })
     },