Sfoglia il codice sorgente

fix: 修复发货模式选择框禁用逻辑及金额字段显示问题

liujt 4 mesi fa
parent
commit
6263595b67

+ 1 - 0
src/views/contractManage/contractBook/components/addDialog.vue

@@ -326,6 +326,7 @@
               placeholder="请选择"
               @change="deliveryModeChange"
               style="width: 100%"
+              :disabled="form.type == 2"
             >
               <el-option
                 v-for="item in shippingModeOptions"

+ 4 - 3
src/views/financialManage/collectionPlan/components/detailDialog.vue

@@ -55,7 +55,7 @@
             <el-form-item label="客户名称:" prop="customerName">
               <el-input v-model="form.customerName" disabled></el-input>
             </el-form-item>
-            <el-form-item label="发货模式:" prop="deliveryMode">
+            <el-form-item :label="menu === 'purchase' ? '收货模式:' : '发货模式:'" prop="deliveryMode">
               <el-input v-model="form.deliveryModeName" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -104,7 +104,7 @@
   import inventoryTabledetail from '@/BIZComponents/inventoryTableDetails.vue';
   import paymentCollectionPlanDetail from '@/BIZComponents/paymentCollectionPlan/Detail.vue';
   import { receiptPaymentPlanById } from '@/api/financialManage/payAndCollectPlan';
-  import { shippingModeOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { shippingModeOp, shippingModePurchaseOp, transactionMethodsOp } from '@/enum/dict.js';
 
   export default {
     mixins: [dictMixins],
@@ -122,6 +122,7 @@
     data() {
       return {
         shippingModeOp,
+        shippingModePurchaseOp,
         transactionMethodsOp,
         fullscreen: false,
         cacheKeyUrl: 'eos-financialManage-collectionPlan-detailDialog',
@@ -243,7 +244,7 @@
           // this.detailData = data;
           data.settlementModeName = this.getDictValue('结算方式', data.settlementMode);
           data.transactionModeName = this.transactionMethodsOp.find(item => item.value == data.transactionMode)?.label || '';
-          data.deliveryModeName = this.shippingModeOp.find(item => item.value == data.deliveryMode)?.label || '';
+          data.deliveryModeName = this.menu === 'purchase' ? this.shippingModePurchaseOp.find(item => item.value == data.deliveryMode)?.label || '' : this.shippingModeOp.find(item => item.value == data.deliveryMode)?.label || '';
           data.sourceOrderTypeName = data.sourceOrderType == 1 ? '销售订单' : '采购订单';
           this.form = data;
           

+ 7 - 7
src/views/financialManage/invoiceManage/components/searchTable.vue

@@ -51,13 +51,13 @@ export default {
           type: 'input',
           placeholder: '请输入'
         },
-        {
-          label: '已收金额:',
-          value: 'receivedTotalAmount',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
+        // {
+        //   label: '已收金额:',
+        //   value: 'receivedTotalAmount',
+        //   width: 380,
+        //   type: 'input',
+        //   placeholder: '请输入'
+        // },
         {
           label: '发票类型:',
           value: 'type',

+ 8 - 8
src/views/financialManage/invoiceManage/index.vue

@@ -259,14 +259,14 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            minWidth: 100,
-            prop: 'receivedTotalAmount',
-            label: '已收金额',
-            slot: 'amount',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          // {
+          //   minWidth: 100,
+          //   prop: 'receivedTotalAmount',
+          //   label: '已收金额',
+          //   slot: 'amount',
+          //   align: 'center',
+          //   showOverflowTooltip: true
+          // },
 
           {
             minWidth: 80,

+ 1 - 0
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -266,6 +266,7 @@
             <el-select
               v-model="form.deliveryMode"
               placeholder="请选择"
+              disabled
               @change="deliveryModeChange"
               style="width: 100%"
             >