改动

zss

2023-11-16 f3e8b1999c8e6142764def9d5b5427abb843e922

改动

 src/views/common/customerorder.vue

@@ -82,22 +82,22 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'customerOrderNo',
            prop: 'contractNo',
            label: '客户订单号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'customerNo',
            label: '客户编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'customerNo',
          //   label: '客户编号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'customerName',
@@ -120,15 +120,15 @@
              return this.coStateList
            }
          },
          {
            minWidth: '120',
            prop: 'coLineNo',
            label: '行号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'coLineNo',
          //   label: '行号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            width: '100px',
@@ -142,7 +142,7 @@
          {
            minWidth: '120',
            width: '100px',
            prop: 'partName',
            prop: 'productName',
            label: '零件名称',
            sort: true,
            isTrue: true,
@@ -160,7 +160,7 @@
          },
          {
            minWidth: '140',
            prop: 'requireNumber',
            prop: 'buyQtyDue',
            label: '已下发数量',
            sort: true,
            isTrue: true,
@@ -169,7 +169,7 @@
          },
          {
            minWidth: '80',
            prop: 'unit',
            prop: 'otcUnit',
            label: '零件单位',
            sort: true,
            isTrue: true,
@@ -179,25 +179,25 @@
          {
            minWidth: '140',
            width: '120',
            prop: 'wantedDeliveryDate',
            label: '期望交货时间',
            prop: 'deliveryDate',
            label: '交货时间',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'datetimerange',
            formatter: this.formatDutyDate
          },
          {
            minWidth: '200',
            width: '120',
            prop: 'plannedDeliveryDate',
            label: '计划交货时间',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'datetimerange',
            formatter: this.formatDutyDate
          },
          // {
          //   minWidth: '200',
          //   width: '120',
          //   prop: 'plannedDeliveryDate',
          //   label: '计划交货时间',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'datetimerange',
          //   formatter: this.formatDutyDate
          // },
          {
            minWidth: '200',
            width: '120',

 src/views/plan/customerorder/customerorder-form.vue

@@ -215,7 +215,7 @@
                    slot="append"
                    icon="el-icon-search"
                    @click="openSalesPartDialog()"
                    v-show="dataForm.id"
                    v-show="dataForm.id==null"
                  ></el-button>
                </el-input>
              </el-form-item>

 src/views/plan/customerorder/index.vue

@@ -449,7 +449,7 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'customerOrderNo',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,

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

@@ -93,8 +93,8 @@
                <el-input
                  v-model="scope.row.qtyPlaned"
                  placeholder=""
                ></el-input>
              </el-form-item> -->
                ></el-input> -->
              </el-form-item>
            </template>
          </el-table-column>
          <el-table-column
@@ -223,22 +223,26 @@
        this.dataForm.customer = []
        const _that = this
        customer.forEach((item) => {
          console.log(item);
           item.qtyPlaned=item.buyQtyDue
          const outPutBatchList = []
          _that.$set(item, 'outPutBatchList', outPutBatchList)
          customerList.push(item)
        })
        this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
        console.log(this.dataForm.customer);
      })
      this.dataForm.customer.forEach(item=>{
            item.qtyPlaned=item.buyQtyDue
        })
      // this.dataForm.forEach(item=>{
      //   console.log(1111);
      //       console.log("循环",item);
      //       item.qtyPlaned=item.buyQtyDue
      //   })
        console.log("data",this.dataForm);
    },
    dataFormSubmit() {
      this.isSubmit = true
      this.$refs.dataForm.validate((valid) => {
        if (valid) {
          // console.log(this.dataForm);
          // return
          checkSchedule(this.dataForm.customer)
            .then((res) => {
              if (res.data.data.success) {

 src/views/plan/manufacturingorder/customerorder.vue

@@ -37,9 +37,9 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="客户订单号" prop="customerOrderNo">
                <el-form-item label="客户订单号" prop="contractNo">
                  <el-input
                    v-model="dataForm.customerOrderNo"
                    v-model="dataForm.contractNo"
                    placeholder=""
                    :disabled="!ediSource"
                  ></el-input>

 src/views/plan/manufacturingorder/index.vue

@@ -89,14 +89,14 @@
            :loading="loadingStructIfs"
            >物料同步ERP
          </el-button> -->
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_refresh_ifsorder"
            @click="refreshIfsorder()"
            type="primary"
            style="margin-left:10px;"
            :loading="refreshIfsorderLoading"
            >刷新ifs车间订单号
          </el-button>
          </el-button> -->

          <el-button
            @click="exportExcel"
@@ -105,12 +105,12 @@
            :loading="loadingExcel"
            >导出
          </el-button>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_update_orderno"
            @click="updateOrderNo"
            type="primary"
            style="margin-left:10px;"
            >更新订单号
            >更新订单号 -->
          </el-button>
        </template>
      </ttable>
@@ -934,12 +934,12 @@
        fun: this.getOperationTaskByCustomer
      })
    }
    if (this.permissions.manufacturingorder_order_merge) {
      this.table.toolbar.push({
        text: '订单合并',
        fun: this.openOrderMerge
      })
    }
    // if (this.permissions.manufacturingorder_order_merge) {
    //   this.table.toolbar.push({
    //     text: '订单合并',
    //     fun: this.openOrderMerge
    //   })
    // }

    /**
     * {

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -501,7 +501,7 @@
                          @refreshTestStandardInfo="refreshTestStandardInfo"
                        ></testStandardTable>
                      </el-tab-pane>
                      <el-tab-pane
                      <!-- <el-tab-pane
                        label="抽检规则"
                        key="tb2"
                        id="tb2"
@@ -587,7 +587,7 @@
                            </el-table>
                          </div>
                        </div>
                      </el-tab-pane>
                      </el-tab-pane> -->
                    </el-tabs>
                  </el-col>
                </el-row>

 src/views/plan/masterproductionschedule/source-table.vue

@@ -32,7 +32,7 @@
      </el-table-column>
      <el-table-column label="备注" show-overflow-tooltip prop="remark">
      </el-table-column>
      <el-table-column
      <!-- <el-table-column
        header-align="center"
        align="center"
        label="操作"
@@ -57,7 +57,7 @@
            >保存
          </el-button>
        </template>
      </el-table-column>
      </el-table-column> -->
    </el-table>
    <div slot="footer" class="dialog-footer">
      <el-button type="info" @click="visible = false">关闭</el-button>