Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

wujianwei

7 天以前 3aa636001be8dbf12b2eb1d424a02514c2c2a19b

Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

 ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue

@@ -5,6 +5,43 @@
      @row-update="rowUpdate" @row-save="rowSave" @refresh-change="refreshChange" @row-del="rowDel"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @on-load="onLoad">

      <!-- template 中 -->
      <template #requiredVehicleTypes-form="{ row, disabled }">
        <template v-if="disabled">
          <span>{{ dictFormat(vehicle_type, row?.requiredVehicleTypes || form?.requiredVehicleTypes) }}</span>
        </template>
        <template v-else>
          <el-select v-model="form.requiredVehicleTypes" placeholder="请选择车型" style="width: 100%">
            <el-option v-for="item in vehicle_type" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
        </template>
      </template>

      <template #orderType-form="{ row, disabled }">
        <template v-if="disabled">
          <span>{{ dictFormat(order_type, row?.orderType || form?.orderType) }}</span>
        </template>
        <template v-else>
          <el-select v-model="form.orderType" placeholder="请选择订单类型" style="width: 100%" clearable>
            <el-option v-for="item in order_type" :key="item.value" :label="item.label" :value="parseInt(item.value)" />
          </el-select>
        </template>
      </template>

      <template #actualVehicleType-form="{ row, disabled }">
        <template v-if="disabled">
          <span>{{ dictFormat(vehicle_type, row?.actualVehicleType || form?.actualVehicleType) }}</span>
        </template>
        <template v-else>
          <el-select v-model="form.actualVehicleType" placeholder="请选择实际车型" style="width: 100%">
            <el-option v-for="item in vehicle_type" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
        </template>
      </template>



      <template #menu-left>
        <!--        <el-button-->
        <!--            type="success"-->
@@ -672,7 +709,7 @@

const { proxy } = useCurrentInstance(
);
const { fee_type, sys_currency, vehicle_type } = proxy.useDict('fee_type', 'sys_currency', 'vehicle_type')
const { fee_type, sys_currency, vehicle_type, order_type } = proxy.useDict('fee_type', 'sys_currency', 'vehicle_type', 'order_type')
const crudRef = ref();
const boxFormRef = ref();
const goodsCrudRef = ref();
@@ -806,7 +843,7 @@
                customerCode: active.customerCode,
                contractId: active.contractId,
                contractName: active.contractName,
                requiredVehicleTypes: active.vehicleType,
                requiredVehicleTypes: active.vehicleType + '',
                quotePlanId: active.quotePlanId,
              });
              form.value.shipperId = undefined;
@@ -891,16 +928,16 @@
          display: true, disabled: true
        },
        requiredVehicleTypes: {
          label: '下单车型', disabled: true,
          display: true, type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',
          rules: [
            {
              required: true,
              message: "下单车型不能为空", trigger: "blur"
            }
          ],
          //  formatter: (row: any, value: any) => dictFormat(vehicle_type, value)
          label: '下单车型',
          minWidth: 130,
          display: true,        // ✅ 改为 true 在表格显示
          type: 'select',
          search: true,
          dicUrl: '/system/dict/data/type/vehicle_type',
          dataType: 'string',

        },

        orderType: {
          label: '订单类型',
          display: true,
@@ -913,9 +950,13 @@
            }
          ],
          change: ({ value }: any) => {

            option.value.group.forEach((item: any) => {

              if (item.prop == 'pcxx') {
                item.column.shipperId.rules.forEach((cItem: any) => {


                  cItem.required = !(value == 1);
                });
                item.column.receiverId.rules.forEach((cItem: any) => {
@@ -1998,7 +2039,6 @@
      display: false,
      search: true,
      type: 'select', dicUrl: '/system/dict/data/type/vehicle_type', dataType: 'string',

    },


@@ -2161,17 +2201,15 @@
      search: false,
      searchSpan: 6,
    },
    // 表单组配置（派车信息组）
    loadingDate: {
      label: '装货日期',
      prop: 'loadingDate', // 保持原有字段名
      bind: 'orderTime',    // 4. 强制绑定到 row 里的 orderTime 字段
      minWidth: 180,
      display: true,          
      viewDisplay: true,     
      bind: 'orderTime',
      label: '装货日期', minWidth: 180,
      addDisplay: false,
      editDisplay: false,
      hide: false,
      viewDisplay: true,
      hide: true,
      search: false,
      searchSpan: 6,
    },
    // orderTimeRange: {
    //   label: '下单时间', display: false, searchRange: true, type: 'date',
@@ -3255,14 +3293,17 @@
      }
    });

    console.log('发送给接口的最终参数:', finalParams);

    // 【核心修改】：直接返回，不要赋值给 queryParams.value
    return finalParams;
  },
  handleBeforeOpenFunc: (type: string) => {

    if (type == 'add') {
      form.value = {};
    } else if (type == 'edit') {
      // form.value = row;

    }
  }

@@ -4325,7 +4366,6 @@
}
const submitForm5 = () => {
  boxFormRef.value.validate((valid: boolean, done: any) => {
    console.log(valid)
    if (valid) {
      boxForm.value.id = form.value.id;
      closeOrder(boxForm.value).then(res => {