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

Fixiaobai

2023-11-15 5ff704af11fc13dd48a48e133652faf1e13d178d

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

 src/api/plan/customerorder.js

@@ -383,7 +383,15 @@
// 作废
export function dropByContractNo(contractNo) {
  return request({
    url: '/mes/plan/customerOrder/dropByContractNo/' + contractNo,
    method: 'get'
    url: '/mes/plan/customerOrder/dropByContractNo',
    method: 'get',
    params: contractNo
  })
}

export function chooseStaff() {
  return request({
    url: '/mes/plan/customerOrder/chooseStaff',
    method: 'get',
  })
}

 src/const/crud/customerOrder/customerOrderForm.js

@@ -69,13 +69,6 @@
    minWidth: 200,
    span: 24
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    type: 'input',
    minWidth: 200,
    span: 24
  }, {
    label: '单位',
    prop: 'otcUnit',
    slot: true,

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

@@ -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>

 src/views/plan/customerorder/index.vue

@@ -1113,7 +1113,7 @@
    },
    // 作废
    cancelHandle(row) {
      this.$confirm('是否确认作废销售订单号为' + row.id + '提示', {
      this.$confirm('确认作废销售订单号为【' + row.contractNo + '】的数据?','提示' , {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,
@@ -1127,22 +1127,7 @@
            this.$message.error('作废失败')
          }
        })
      })
      // .then(() => {
      //   markPlanned([row.id], '05cancel').then((response) => {
      //     var data = response.data
      //     if (data.code === 0) {
      //       this.$message.success('作废成功')
      //       this.getData()
      //     } else {
      //       this.$message.error('作废失败')
      //     }
      //   })
      // })
      // .then((data) => {
      //   this.$message.success('作废成功')
      //   this.getData()
      // })
      }).catch(()=>{ })
    },
    // 删除
    deleteHandle(row) {

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

@@ -68,8 +68,8 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="业务员" prop="salesMan">
              <el-select @change="selsctionSales" v-model="salesSelectData" style="width:100%">
                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item" :label="item.staffName"/>
              <el-select @change="selsctionSales" filterable v-model="salesSelectData" style="width:100%">
                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -391,7 +391,7 @@
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
// import { chooseStaff } from '@/api/admin/productType'
import { chooseStaff } from '@/api/plan/customerorder'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'

export default {
@@ -477,13 +477,16 @@
      this.tableData.splice(index,1)
    },
    selsctionSales(data){
        this.dataForm.salesMan =  data.staffName
        this.dataForm.salerWorkCode = data.staffNo
        if(data){
          let arr = data.split(",")
          this.dataForm.salesMan =  arr[1]
          this.dataForm.salerWorkCode = arr[0]
        }
    },
    getStaffOptions(){
      // chooseStaff().then((response)=>{
      //   this.staffOptions = response.data.data
      // })
      chooseStaff().then((response)=>{
        this.staffOptions = response.data.data
      })
    },
    init(id) {
      this.initDataForm()
@@ -555,6 +558,10 @@
        this.tableData[index].partNo = part.partNo
        this.tableData[index].customerPartSpec = part.specs
        this.tableData[index].productName = part.partName
        this.tableData[index].otcUnit = part.unit
        this.tableData[index].buyQtyDue = part.numCount
        this.tableData[index].manufactureAttr = part.materialAttribute

      }
    },
    // 全屏

 src/views/plan/masterproductionschedule/auto-manufacturingorder.vue

@@ -251,7 +251,7 @@
                    unit: item.unit,
                    workShop: null,
                    workshopTypeCode: 'M',
                    requiredDate: null,
                    requiredDate: this.masterProduction.requiredDate,
                    id: item.id,
                    manufactureAttr: this.masterProduction.manufactureAttr,
                    isReportOperation: this.isReportOperation