Merge remote-tracking branch 'origin/master'

lyh

2025-05-28 e14ed882d12df3b48e59390eba364442cdff70bd

 src/views/tms/modules/outBound/OutboundOrderModal.vue

@@ -54,7 +54,7 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-if="addShow" label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditDate">
              <j-date placeholder="请选择审核时间" v-model="model.auditDate" style="width: 100%" disabled/>
              <j-date placeholder="请选择审核时间" :show-time="true" dateFormat="YYYY-MM-DD HH:mm" v-model="model.auditDate" style="width: 100%" disabled/>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -218,10 +218,16 @@
        confirmLoading: false,
        validatorRules: {
           outStorehouseType: [
              { required: true, message: '请输入出库类型!'},
              { required: true, message: '请选择出库类型!'},
           ],
           subjectMatter: [
              { required: true, message: '请输入领用事由!'},
           ],
          reviewer: [
              { required: true, message: '请选择审核人!'},
           ],
          outboundTime: [
              { required: true, message: '请选择出库时间!'},
           ],
        },
        url: {
@@ -299,7 +305,7 @@
        if (this.title === '编辑') {
         ids = this.dataSource.map(item => item.toolLedgerDetailId).join(',')
        }
        this.$refs.selectOutBoundToolModal.showModal(ids)
        this.$refs.selectOutBoundToolModal.showOrderModal(ids)
      },
      add () {
        this.addShow = false
@@ -349,6 +355,10 @@
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            if (this.dataSource == null || this.dataSource.length === 0) {
              this.$message.warning('请选择出库工具!');
              return
            }
            this.model.outboundDetailList = this.dataSource
            that.confirmLoading = true;
            let httpurl = '';