Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

Fixiaobai

2023-11-15 ec5790cd8e6bd32a3dd599ace9b27f298789bc2d

Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

 src/api/plan/customerorder.js

@@ -252,7 +252,7 @@
export function downloadProcessConfigFile(filename, bucket, originalFileName) {
  return request({
    url: '/mes/plan/customerOrder/processConfig/' + bucket + '/' + filename,
    method: 'get',
    method: 'post',
    responseType: 'blob'
  }).then((response) => {
    // 处理返回的文件流

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

@@ -32,7 +32,7 @@
            <el-col :span="6">
              <el-form-item label="同步数据来源" prop="sourceId">
                <el-input
                  v-model="dataForm.sourceId == 0 ? '同步' : '手动'"
                  :value="dataForm.sourceId == 0 ? '外部' : '内部'"
                  placeholder=""
                  disabled
                ></el-input>

 src/views/plan/customerorder/index.vue

@@ -345,11 +345,9 @@
      sourceIdList: [{
        label: '外部',
        value: '0',
        type: 'success',
      },{
        label: '内部',
        value: '1',
        type: ''
      }],
      stateTagArr: [
        {
@@ -817,7 +815,7 @@
        }
      },
      immediate: true
    }
    },
  },
  mounted() {
    this.initQueryParams()
@@ -886,7 +884,6 @@
          prop: 'coState',
          searchInfoType: 'select',
          // propVal: '01partUnCheck'
          propVal: ''
        })
      )
      this.$refs.customerOrderTable.setQueryParam(queryParam)
@@ -930,6 +927,7 @@
            }
          }
          this.scheduleVisible = true
          console.log(this.multipleSelection);
          this.$nextTick(() => {
            this.$refs.schedule.init(this.multipleSelection)
          })

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

@@ -174,7 +174,7 @@
            </el-select>
          </template>
          <template slot="menu" slot-scope="scope">
              <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2"  @click="delRow(scope.row,scope.$index)">取消</el-button>
              <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2"  @click="delRow(scope.row,scope.index)">取消</el-button>
          </template>
      </avue-crud>
    </div>
@@ -398,6 +398,27 @@
  components: {
    PartDialog
  },
  watch:{
    visible(newVal){
      if(!newVal){
        
        this.tableData = [{
            "$cellEdit": true,
            "$index": 0,
            "partNo": "",
            "specs": "",
            "manufactureAttr": "",
            "productName": "",
            "productType": "",
            "otcUnit": "",
            "buyQtyDue": "",
            "shippingAddress": "",
            "remark": "",
            "isTrusted": true
        }]
      }
    }
  },
  data() {
    return {
      salesSelectData: null,

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

@@ -19,6 +19,7 @@
    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
      <div class="avue-crud">
        <el-table
          border
          :data="dataForm.customer"
          style="width: 100%"
          class="mps-table"
@@ -28,17 +29,17 @@
            header-align="center"
            align="center"
            label="客户订单编号"
            width="120px"
            min-width="130px"
          >
            <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
            header-align="center"
            align="center"
            label="零件号"
            width="120px"
            min-width="130"
          >
            <template slot-scope="scope">
              <el-form-item>{{ scope.row.partNo }}</el-form-item>
@@ -53,7 +54,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,22 +68,20 @@
              <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="已计划数量"
            width="120px"
          >
            <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"
            align="center"
            label="本次计划数量"
            width="170px"
          >
            <template scope="scope">
              <el-form-item
@@ -91,7 +90,7 @@
              >
                <el-input
                  v-model="scope.row.qtyPlaned"
                  placeholder=""
                  placeholder="请输入本次计划数量"
                ></el-input>
              </el-form-item>
            </template>
@@ -100,10 +99,9 @@
            header-align="center"
            align="center"
            label="单位"
            width="60px"
          >
            <template slot-scope="scope">
              <span>{{ scope.row.unit }}</span>
              <span>{{ scope.row.otcUnit }}</span>
            </template>
          </el-table-column>
          <el-table-column
@@ -111,7 +109,6 @@
            header-align="center"
            align="center"
            label="制造属性"
            width="170px"
          >
            <template scope="scope">
              <el-form-item :prop="'manufactureAttr.' + scope.$index">
@@ -135,10 +132,9 @@
            header-align="center"
            align="center"
            label="需求日期"
            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
@@ -146,6 +142,7 @@
            align="center"
            show-overflow-tooltip
            label="备注"
            min-width="140"
          >
            <template slot-scope="scope">
              <el-form-item>