Merge remote-tracking branch 'origin/master'

zss

2023-11-17 2518e47a3ac999978fbf14612c967c3bbf421d25

 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>
@@ -174,7 +174,7 @@
            </el-select>
          </template>
          <template slot="menu" slot-scope="scope">
              <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2"  @click="delRow(scope.row,scope.$index)">取消</el-button>
              <el-button type="text" icon="el-icon-circle-close" :disabled="tableData.length<2"  @click="delRow(scope.row,scope.index)">取消</el-button>
          </template>
      </avue-crud>
    </div>
@@ -391,12 +391,33 @@
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 {
  components: {
    PartDialog
  },
  watch:{
    visible(newVal){
      if(!newVal){
        
        this.tableData = [{
            "$cellEdit": true,
            "$index": 0,
            "partNo": "",
            "specs": "",
            "manufactureAttr": "",
            "productName": "",
            "productType": "",
            "otcUnit": "",
            "buyQtyDue": "",
            "shippingAddress": "",
            "remark": "",
            "isTrusted": true
        }]
      }
    }
  },
  data() {
    return {
@@ -456,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()
@@ -534,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

      }
    },
    // 全屏