bug

src/mixins/tableColumnsMixin.js

@@ -62,8 +62,16 @@ export default {
       let sList = list.filter((d, i, r) => {
         return d[key];
       });
-      let devColumns =
-        this.newColumns?.length > 0 ? this.newColumns : this.columns;
+      let devColumns = [];
+      if (this.newColumns?.length) {
+        devColumns = this.newColumns;
+      }
+      if (typeof this.columns == 'function') {
+        devColumns = this.columns();
+      } else {
+        devColumns = this.columns;
+      }
+
       let dList = devColumns.filter((d, i, r) => {
         return d[key] && d[key] !== '序号';
       });

src/views/financialManage/components/feeRelatedInfoTable.vue

@@ -492,6 +492,8 @@
         this.$set(this.form.datasource[this.editIndex], 'linkName', val.name);
         this.$set(this.form.datasource[this.editIndex], 'linkCode', val.code);
         this.$set(this.form.datasource[this.editIndex], 'amount', val.amount);
+        this.handleChangeAmount();
+
         
       },
       clearData() {

src/views/purchasingManage/purchaseOrder/components/detailDialog.vue

@@ -279,7 +279,7 @@
           <ele-pro-table
             ref="table"
             :needPage="false"
-            :columns="competAnalysisListcolumns"
+            :columns="columns"
             @columns-change="handleColumnChange"
             :cache-key="cacheKeyUrl"
             :datasource="detailData.productList"
@@ -461,56 +461,8 @@
         },
         rules: {},
         detailData: {},
-        receiptPaymentListcolumns: [
-          {
-            width: 45,
-            type: 'index',
-            columnKey: 'index',
-            align: 'center',
-            fixed: 'left'
-          },
-          {
-            width: 200,
-            prop: 'moneyName',
-            label: '款项名称',
-            slot: 'moneyName',
-            align: 'center'
-          },
-          {
-            width: 100,
-            prop: 'price',
-            label: '金额',
-            slot: 'price',
-            formatter: (_row, _column, cellValue) => {
-              return _row.price + '元';
-            },
-            align: 'center'
-          },
-          {
-            width: 100,
-            prop: 'ratio',
-            label: '比例',
-            slot: 'ratio',
-            formatter: (_row, _column, cellValue) => {
-              return _row.ratio + '%';
-            },
-            align: 'center'
-          },
-          {
-            width: 160,
-            prop: 'deadLine',
-            label: '截止日期',
-            slot: 'deadLine',
-            align: 'center'
-          },
-          {
-            prop: 'remark',
-            label: '	说明',
-            slot: 'remark',
-            align: 'center'
-          }
-        ],
-        competAnalysisListcolumns: [
+
+       columns: [
           {
             width: 45,
             type: 'index',

src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -67,6 +67,15 @@
           ></el-input>
         </el-form-item>
       </template>
+      <template v-slot:batchNo="scope">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + scope.$index + '.batchNo'"
+        >
+          <el-input v-model="scope.row.batchNo" type="number"></el-input>
+        </el-form-item>
+      </template>
+
       <!-- :disabled="!outsourceSendCode"      -->
       <template v-slot:sendTotalWeight="scope">
         <el-form-item

src/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue

@@ -108,7 +108,7 @@
       <ele-pro-table
         ref="table"
         :needPage="false"
-        :columns="competAnalysisListcolumns"
+        :columns="columns"
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
         :datasource="detailData.productList"
@@ -179,7 +179,7 @@
         rules: {},
         detailData: {},
 
-        competAnalysisListcolumns: [
+        columns: [
           {
             width: 45,
             type: 'index',

src/views/saleManage/saleOrder/entrustedReceive/components/detailDialog.vue

@@ -86,7 +86,7 @@
       <ele-pro-table
         ref="table"
         :needPage="false"
-        :columns="competAnalysisListcolumns"
+        :columns="columns"
         @columns-change="handleColumnChange"
         :cache-key="cacheKeyUrl"
         :datasource="detailData.productList"
@@ -156,7 +156,7 @@
         rules: {},
         detailData: {},
 
-        competAnalysisListcolumns: [
+        columns: [
           {
             width: 45,
             type: 'index',

src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue

@@ -2,7 +2,7 @@
   <ele-pro-table
     ref="table"
     :needPage="false"
-    :columns="competAnalysisListcolumns"
+    :columns="columns"
     :datasource="form.datasource"
     row-key="id"
     @columns-change="handleColumnChange"
@@ -57,7 +57,7 @@
       clientEnvironmentId() {
         return this.$store.state.user.info.clientEnvironmentId;
       },
-      competAnalysisListcolumns() {
+      columns() {
         return [
           {
             width: 45,