Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/plan/customerorder/schedule-table.vue

@@ -31,7 +31,7 @@
            width="120px"
          >
            <template slot-scope="scope">
              <el-form-item>{{ scope.row.customerOrderNo }}</el-form-item>
              <el-form-item>{{ scope.row.contractNo }}</el-form-item>
            </template>
          </el-table-column>
          <el-table-column
@@ -53,7 +53,7 @@
          >
            <template slot-scope="scope">
              <el-form-item class="inline-el-hidden">{{
                scope.row.partName
                scope.row.productName
              }}</el-form-item>
            </template>
          </el-table-column>
@@ -67,7 +67,7 @@
              <el-form-item>{{ scope.row.buyQtyDue }}</el-form-item>
            </template>
          </el-table-column>
          <el-table-column
          <!-- <el-table-column
            header-align="center"
            align="center"
            label="已计划数量"
@@ -76,7 +76,7 @@
            <template slot-scope="scope">
              <el-form-item>{{ scope.row.requireNumber }}</el-form-item>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column
            prop="remainderRequired"
            header-align="center"
@@ -85,14 +85,15 @@
            width="170px"
          >
            <template scope="scope">
              <el-form-item
              <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item>
              <!-- <el-form-item
                :prop="'customer.' + scope.$index"
                :rules="rules.qtyPlaned"
              >
                <el-input
                  v-model="scope.row.qtyPlaned"
                  placeholder=""
                ></el-input>
                ></el-input> -->
              </el-form-item>
            </template>
          </el-table-column>
@@ -103,7 +104,7 @@
            width="60px"
          >
            <template slot-scope="scope">
              <span>{{ scope.row.unit }}</span>
              <span>{{ scope.row.otcUnit }}</span>
            </template>
          </el-table-column>
          <el-table-column
@@ -138,7 +139,7 @@
            width="160px"
          >
            <template slot-scope="scope">
              <el-form-item>{{ scope.row.wantedDeliveryDate }}</el-form-item>
              <el-form-item>{{ scope.row.deliveryDate }}</el-form-item>
            </template>
          </el-table-column>
          <el-table-column
@@ -222,6 +223,7 @@
        this.dataForm.customer = []
        const _that = this
        customer.forEach((item) => {
           item.qtyPlaned=item.buyQtyDue
          const outPutBatchList = []
          _that.$set(item, 'outPutBatchList', outPutBatchList)
          customerList.push(item)