zouyu
2023-11-15 8dc474768e47ecfcb2f590e7d5c704b46f7a612a
	modified:   src/api/plan/customerorder.js
modified: src/views/plan/customerorder/index.vue
modified: src/views/plan/customerorder/sample-customerorder-form.vue
modified: src/views/plan/customerorder/schedule-table.vue
modified: vue.config.js
已修改5个文件
36 ■■■■ 文件已修改
src/api/plan/customerorder.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/customerorder/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/customerorder/sample-customerorder-form.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/customerorder/schedule-table.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/plan/customerorder.js
@@ -391,7 +391,8 @@
// 作废
export function dropByContractNo(contractNo) {
  return request({
    url: '/mes/plan/customerOrder/dropByContractNo/' + contractNo,
    method: 'get'
    url: '/mes/plan/customerOrder/dropByContractNo',
    method: 'get',
    params: contractNo
  })
}
src/views/plan/customerorder/index.vue
@@ -1186,13 +1186,13 @@
    },
    // 作废
    cancelHandle(row) {
      this.$confirm('是否确认作废销售订单号为' + row.customerOrderNo + '提示', {
      this.$confirm('确认作废销售订单号为【' + row.contractNo + '】的数据?','提示' , {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,
        type: 'warning'
      }).then(() => {
        dropByContractNo(row.customerOrderNo).then((res) => {
        dropByContractNo({contractNo:row.contractNo}).then((res) => {
          if (res.data.code === 0) {
            this.$message.success('作废成功')
            this.getData()
src/views/plan/customerorder/sample-customerorder-form.vue
@@ -406,7 +406,6 @@
import { addObj } from '@/api/plan/customer'
import { remote } from '@/api/admin/dict'
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
import { chooseStaff } from '@/api/admin/productType'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'
@@ -415,6 +414,26 @@
  components: {
    PartDialog
  },
  watch:{
    visible(newVal){
      if(!newVal){
        this.tableData = [{
          "$cellEdit": true,
          "$index": 0,
          "partNo": "",
          "customerPartSpec": "",
          "manufactureAttr": "",
          "productName": "",
          "productType": "",
          "otcUnit": "",
          "buyQtyDue": "",
          "shippingAddress": "",
          "remark": "",
          "isTrusted": true
        }]
      }
    }
  },
  data() {
    return {
      salesSelectData: null,
src/views/plan/customerorder/schedule-table.vue
@@ -67,7 +67,7 @@
              <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="已计划数量"
@@ -76,7 +76,7 @@
            <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"
vue.config.js
@@ -4,7 +4,7 @@
 */
// const url = 'http://192.168.0.23:9999'
  const url = 'http://192.168.0.60:9999'
  const url = 'http://192.168.0.23:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'