Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

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

@@ -209,13 +209,12 @@
                <el-input
                  v-model="dataForm.partNo"
                  placeholder=""
                  disabled
                >
                  <el-button
                    slot="append"
                    icon="el-icon-search"
                    @click="openSalesPartDialog()"
                    v-show="dataForm.id"
                    @click="openPartDialog()"

                  ></el-button>
                </el-input>
              </el-form-item>
@@ -248,10 +247,11 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
              <el-form-item label="工艺文件名称" prop="docName">
                <el-input
                  v-model="dataForm.shippingAddress"
                  v-model="dataForm.docName"
                  placeholder=""
                  disabled
                ></el-input>
              </el-form-item>
            </el-col>
@@ -323,6 +323,14 @@
            </el-col> -->
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="收货地址" prop="shippingAddress">
                <el-input
                  v-model="dataForm.shippingAddress"
                  placeholder=""
                ></el-input>
              </el-form-item>
            </el-col>
            <!-- <el-col :span="6">
              <el-form-item label="OTC推送状态" prop="remark">
                <span>{{
@@ -337,7 +345,22 @@
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item label="订单说明" prop="remark">
              <el-form-item label="订单备注" prop="comment">
                <el-input
                  type="textarea"
                  :rows="3"
                  placeholder=""
                  v-model="dataForm.comment"
                  maxlength="500"
                  show-word-limit
                >
                </el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item label="产品备注" prop="remark">
                <el-input
                  type="textarea"
                  :rows="3"
@@ -620,15 +643,16 @@
              show-overflow-tooltip
            >
            </el-table-column>
            <el-table-column prop="lineNumber" align="center" label="行号">
            </el-table-column>
            <!-- <el-table-column prop="lineNumber" align="center" label="行号"> -->
            <!-- </el-table-column> -->
            <el-table-column
              prop="originalFileName"
              align="center"
              label="原文件名"
              width="200"
            >
            </el-table-column>
            <el-table-column prop="fileName" align="center" label="文件名">
            <el-table-column prop="fileName" align="center" label="文件后缀">
            </el-table-column>
            <el-table-column prop="createUser" align="center" label="上传人">
            </el-table-column>
@@ -661,13 +685,13 @@
            <!--            </el-table-column>-->
            <el-table-column fixed="right" align="center" label="操作">
              <template slot-scope="scope">
                <el-button
                <!-- <el-button
                  @click="synchronizeFile(scope.row)"
                  type="text"
                  size="small"
                  :disabled="scope.row.lineNumber !== dataForm.customerNo"
                  >同步</el-button
                >
                > -->
                <el-button
                  @click="delProcessConfigFile(scope.row)"
                  type="text"
@@ -803,7 +827,9 @@
        productName: '',
        productType: '',
        partNo: '',
        technologyDocumentId: '',
        docNumber: '',
        docName: '',
        shippingAddress: '',
        remark: '',
        otcUnit: '',
@@ -1012,9 +1038,7 @@
            // if (response.data.data.customerOrderList != null) {
            //   this.dataForm = response.data.data.customerOrderList
            //
            //   console.log('0')
            //   if (this.dataForm.OrderOrContract) {
            //     console.log('1')
            //     // 将订单还是合同转义
            //     if (this.dataForm.OrderOrContract == '0') {
            //       this.dataForm.OrderOrContract = '合同'
@@ -1023,9 +1047,8 @@
            //     }
            //   }
            // } else {
            //   console.log('2')
            this.dataForm = response.data.data
            

            // }
            // this.fileList = response.data.data.customerOrderAttachmentList
            const sourceId = response.data.data.sourceId
@@ -1167,25 +1190,34 @@
        }
      })
    },
    // 零件选择
        // 零件选择
    openPartDialog() {
      if (
        this.dataForm.coState === '01partUnCheck' ||
        this.dataForm.coState === '02technologyUnCheck'
      ) {
        this.showPart = true
      } else {
        this.$message.warning(
          '订单只有在【零件待选】、【工艺文件待选】状态下，才能进行零件修改'
        )
      }
      this.showPart = true
    },
    selectPart(part) {
      if (part) {
        this.dataForm.partNo = part.partNo
        this.$refs.dataForm.validateField('partNo', (valid) => {})
      }
    },
    // 零件选择
    // openPartDialog() {
    //   if (
    //     this.dataForm.coState === '01partUnCheck' ||
    //     this.dataForm.coState === '02technologyUnCheck'
    //   ) {
    //     this.showPart = true
    //   } else {
    //     this.$message.warning(
    //       '订单只有在【零件待选】、【工艺文件待选】状态下，才能进行零件修改'
    //     )
    //   }
    // },
    // selectPart(part) {
    //   if (part) {
    //     this.dataForm.partNo = part.partNo
    //     this.$refs.dataForm.validateField('partNo', (valid) => {})
    //   }
    // },
    // 全屏
    fullscreen() {
      this.isFullScreen = !this.isFullScreen
@@ -1272,9 +1304,6 @@
      this.getConfigFiles()
    },
    delProcessConfigFile(row) {
      if (row.lineNumber !== this.dataForm.otcLineNo) {
        this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      } else {
        this.$confirm('是否删除工艺配置文件', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -1287,7 +1316,6 @@
          .then((data) => {
            this.getConfigFiles()
          })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(
@@ -1320,7 +1348,6 @@
    // 保存配置单
    saveConfig() {
      const configId = this.configContent.id
      console.log(this.configContent)
      for (
        let i = this.configContent.processConfigDataList.length - 1;
        i >= 0;
@@ -1336,7 +1363,6 @@
      }
      if (configId) {
        newProcessConfigEditOne(this.configContent).then((res) => {
          console.log(res)
          if (res.data.code === 0) {
            this.$message.success('保存成功')
            this.init(this.configContent.orderId)
@@ -1346,7 +1372,6 @@
        })
      } else {
        newProcessConfigAddOne(this.configContent).then((res) => {
          console.log(res)
          if (res.data.code === 0) {
            this.$message.success('保存成功')
            this.init(this.configContent.orderId)
@@ -1371,7 +1396,6 @@
        } else {
          this.$message.error('该销售订单号下，没有其他订单行')
          /* const configId = this.configContent.id
          console.log(this.configContent)
          for (
            let i = this.configContent.processConfigDataList.length - 1;
            i >= 0;
@@ -1387,7 +1411,6 @@
          }
          if (configId) {
            newProcessConfigEdit(this.configContent).then((res) => {
              console.log(res)
              if (res.data.code === 0) {
                this.$message.success('保存成功')
                this.init(this.configContent.orderId)
@@ -1397,7 +1420,6 @@
            })
          } else {
            newProcessConfigAdd(this.configContent).then((res) => {
              console.log(res)
              if (res.data.code === 0) {
                this.$message.success('保存成功')
                this.init(this.configContent.orderId)
@@ -1409,7 +1431,6 @@
        }
      })
      /* const configId = this.configContent.id
      console.log(this.configContent)
      for (
        let i = this.configContent.processConfigDataList.length - 1;
        i >= 0;
@@ -1425,7 +1446,6 @@
      }
      if (configId) {
        newProcessConfigEdit(this.configContent).then((res) => {
          console.log(res)
          if (res.data.code === 0) {
            this.$message.success('保存成功')
            this.init(this.configContent.orderId)
@@ -1435,7 +1455,6 @@
        })
      } else {
        newProcessConfigAdd(this.configContent).then((res) => {
          console.log(res)
          if (res.data.code === 0) {
            this.$message.success('保存成功')
            this.init(this.configContent.orderId)
@@ -1497,7 +1516,6 @@
      // var param = Object.assign({ current: 1, size: 20 })
      // getProcessConfigPage(param).then((res) => {
      //   const list = res.data.data.records
      //   console.log(list)
      // })
    },
    // 获取确认