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

zouyu

2023-11-17 1cf81a64af5bac57f2af8c419db0b22b3d5ba7c8

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

 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

@@ -71,9 +71,9 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="客户订单状态" prop="returnStatus">
              <el-form-item label="客户订单状态" prop="coState">
                <el-input
                v-model="dataForm.returnStatus"
                v-model="dataForm.coState"
                  placeholder=""
                  filterable
                  style="width: 100%"
@@ -909,6 +909,13 @@
                )
              }
            }
            let val=""
            this.coStates.forEach(item=>{
              if(item.value==this.dataForm.coState){
                val=item.label
              }
            })
            this.dataForm.coState=val
          })
        } else {
          this.title = '新增'
@@ -916,6 +923,7 @@
        }
      })
    },
    
    getFileList() {
      this.fileList = []
      const queryParam = { orderNumber: this.dataForm.contractNo }
@@ -1095,10 +1103,23 @@
      this.getConfigFiles()
    },
    delProcessConfigFile(row) {
      if (row.lineNumber !== this.dataForm.otcLineNo) {
        this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      } else {
        this.$confirm('是否删除工艺配置文件', '提示', {
      // if (row.lineNumber !== this.dataForm.otcLineNo) {
      //   this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      // } else {
      //   this.$confirm('是否删除工艺配置文件', '提示', {
      //     confirmButtonText: '确定',
      //     cancelButtonText: '取消',
      //     type: 'warning',
      //     closeOnClickModal: false
      //   })
      //     .then(function() {
      //       return deleteProcessConfigFile(row.id)
      //     })
      //     .then((data) => {
      //       this.getConfigFiles()
      //     })
      // }
      this.$confirm('是否删除工艺配置文件', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
@@ -1110,7 +1131,6 @@
          .then((data) => {
            this.getConfigFiles()
          })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(

 src/views/plan/masterproductionschedule/index.vue

@@ -62,12 +62,12 @@
            type="primary"
            style="margin-left:10px;"
            >SCM状态变更
          </el-button>
          </el-button> -->
          <el-button
            type="primary"
            style="margin-left:10px;"
            >新增采购计划
          </el-button> -->
          </el-button>
        </template>
      </ttable>