Merge remote-tracking branch 'origin/master'

zss

2023-11-17 2518e47a3ac999978fbf14612c967c3bbf421d25

 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%"
@@ -156,12 +156,12 @@
                  placeholder=""
                  disabled
                >
                  <el-button
                  <!-- <el-button
                    slot="append"
                    icon="el-icon-search"
                    @click="openSalesPartDialog()"
                    v-show="dataForm.id"
                  ></el-button>
                  ></el-button> -->
                </el-input>
              </el-form-item>
            </el-col>
@@ -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 }
@@ -972,25 +980,21 @@
      this.$refs.dataForm.validate((valid) => {
        if (valid) {
          if (this.dataForm.id) {
            updateCustomerOrderById(this.dataForm)
              .then((data) => {
            updateCustomerOrderById(this.dataForm).then((data) => {
                this.$message.success('修改成功')
                this.visible = false
                this.buttonDisable = false
                this.$emit('refreshDataList', 1)
              })
              .catch((error) => {
              }).catch((error) => {
                this.buttonDisable = false
              })
          } else {
            addCustomerOrder(this.dataForm)
              .then((data) => {
            addCustomerOrder(this.dataForm).then((data) => {
                this.$message.success('添加成功')
                this.visible = false
                this.buttonDisable = false
                this.$emit('refreshDataList', 1)
              })
              .catch((error) => {
              }).catch((error) => {
                this.buttonDisable = false
              })
          }
@@ -1099,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',
@@ -1114,7 +1131,6 @@
          .then((data) => {
            this.getConfigFiles()
          })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(