|  | @@ -67,30 +67,33 @@
 | 
	
		
			
				|  |  |                  <el-input-number v-model="row.orderQuantity" size="small" :controls="false" :precision="0"
 | 
	
		
			
				|  |  |                    @input="amountChange(row)" style="width: 100%" />
 | 
	
		
			
				|  |  |                </template> -->
 | 
	
		
			
				|  |  | -              <template slot="priceOne" slot-scope="{ row }">
 | 
	
		
			
				|  |  | -                <el-input v-model.trim="row.priceOne" size="small"></el-input>
 | 
	
		
			
				|  |  | -                <!-- <span v-else>{{ row.refreshChange | IntegerFormat }}</span> -->
 | 
	
		
			
				|  |  | +              <!-- <template slot="priceOne" slot-scope="{ row }">
 | 
	
		
			
				|  |  | +                <el-input v-model="row.priceOne" size="small" :controls="false" :precision="0"></el-input>
 | 
	
		
			
				|  |  | +              </template> -->
 | 
	
		
			
				|  |  | +              <template slot="priceOne" slot-scope="{row}">
 | 
	
		
			
				|  |  | +                <el-input-number v-model="row.priceOne" size="small" :controls="false" :precision="0"
 | 
	
		
			
				|  |  | +                   style="width: 100%" />
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |                <template slot="priceTwo" slot-scope="{ row }">
 | 
	
		
			
				|  |  | -                <el-input v-model.trim="row.priceTwo" size="small"></el-input>
 | 
	
		
			
				|  |  | +                <el-input v-model="row.priceTwo" size="small"></el-input>
 | 
	
		
			
				|  |  |                  <!-- <span v-else>{{ row.refreshChange | IntegerFormat }}</span> -->
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |                <template slot="priceThree" slot-scope="{ row }">
 | 
	
		
			
				|  |  | -                <el-input v-model.trim="row.priceThree" size="small"></el-input>
 | 
	
		
			
				|  |  | +                <el-input v-model="row.priceThree" size="small"></el-input>
 | 
	
		
			
				|  |  |                  <!-- <span v-else>{{ row.refreshChange | IntegerFormat }}</span> -->
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |                <template slot="priceFour" slot-scope="{ row }">
 | 
	
		
			
				|  |  | -                <el-input v-model.trim="row.priceFour" size="small"></el-input>
 | 
	
		
			
				|  |  | +                <el-input v-model="row.priceFour" size="small"></el-input>
 | 
	
		
			
				|  |  |                  <!-- <span v-else>{{ row.refreshChange | IntegerFormat }}</span> -->
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |                <template slot="sharedCompany" slot-scope="{ row, index }">
 | 
	
		
			
				|  |  |                  <span style="display:flex">
 | 
	
		
			
				|  |  | -                  <el-select v-model="row.sharedCompany" placeholder="请选择" size="small" filterable style="width:60%"
 | 
	
		
			
				|  |  | -                    >
 | 
	
		
			
				|  |  | -                    <el-option v-for="item in sharedCompanyoptions" :key="item.id" :label="item.fullName" :value="item.id">
 | 
	
		
			
				|  |  | +                  <el-select v-model="row.sharedCompany" multiple  placeholder="请选择" size="small" filterable
 | 
	
		
			
				|  |  | +                    style="width:60%">
 | 
	
		
			
				|  |  | +                    <el-option v-for="item in sharedCompanyoptions" :key="item.id" :label="item.fullName"
 | 
	
		
			
				|  |  | +                      :value="item.id">
 | 
	
		
			
				|  |  |                      </el-option>
 | 
	
		
			
				|  |  |                    </el-select>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |                  </span>
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |                <template slot-scope="scope" slot="menu">
 | 
	
	
		
			
				|  | @@ -147,7 +150,7 @@ export default {
 | 
	
		
			
				|  |  |    data() {
 | 
	
		
			
				|  |  |      return {
 | 
	
		
			
				|  |  |        data: [],
 | 
	
		
			
				|  |  | -      sharedCompanyoptions:[],
 | 
	
		
			
				|  |  | +      sharedCompanyoptions: [],
 | 
	
		
			
				|  |  |        activeName: 'searchList',
 | 
	
		
			
				|  |  |        dialogVisibles: false,
 | 
	
		
			
				|  |  |        tableData: [],
 | 
	
	
		
			
				|  | @@ -388,6 +391,12 @@ export default {
 | 
	
		
			
				|  |  |      refreshChange() {
 | 
	
		
			
				|  |  |        this.onLoad(this.page, this.search)
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    //刷新触发
 | 
	
		
			
				|  |  | +    refreshChangeCost() {
 | 
	
		
			
				|  |  | +      // this.treeDeptId = ''
 | 
	
		
			
				|  |  | +      this.page.currentPage = 1;
 | 
	
		
			
				|  |  | +      this.onLoad(this.page);
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      searchChange(params, done) {
 | 
	
		
			
				|  |  |        console.log(params);
 | 
	
		
			
				|  |  |        console.log(params.$salesCompanyName);
 | 
	
	
		
			
				|  | @@ -402,6 +411,8 @@ export default {
 | 
	
		
			
				|  |  |        this.selectionList = list
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      selectionChangeCost(list) {
 | 
	
		
			
				|  |  | +      this.goodsListSave = list
 | 
	
		
			
				|  |  | +      console.log(list);
 | 
	
		
			
				|  |  |        this.tableData = list
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //新增
 | 
	
	
		
			
				|  | @@ -507,20 +518,22 @@ export default {
 | 
	
		
			
				|  |  |      // 确认导入
 | 
	
		
			
				|  |  |      importGoods() {
 | 
	
		
			
				|  |  |        console.log(this.goodsListSave);
 | 
	
		
			
				|  |  | -      if (this.goodsListSave.some(item => item.priceOne == "" || item.priceTwo == "" || item.priceThree == "" || item.priceFour == "")) {
 | 
	
		
			
				|  |  | -        this.$message.error('请填写所有价格字段');
 | 
	
		
			
				|  |  | -        console.log('字段没填');
 | 
	
		
			
				|  |  | -      } 
 | 
	
		
			
				|  |  | -      if (this.goodsListSave.length > 0) {
 | 
	
		
			
				|  |  | +      if (this.goodsListSave.some(item => item.priceOne==undefined || item.priceTwo==undefined || item.priceThree==undefined || item.priceFour==undefined)) {
 | 
	
		
			
				|  |  | +        this.$message.error('请填写所有售价');
 | 
	
		
			
				|  |  | +      }else{
 | 
	
		
			
				|  |  | +        if (this.goodsListSave.length > 0) {
 | 
	
		
			
				|  |  |          this.goodsListSaveHandle()
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +     
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      goodsListSaveHandle() {
 | 
	
		
			
				|  |  |        this.goodsListSave.forEach(item => {
 | 
	
		
			
				|  |  | +        item.sharedCompany?item.sharedCompany.join(','):''
 | 
	
		
			
				|  |  |          this.goodsListSave.specificationAndModel = item.typeno
 | 
	
		
			
				|  |  |          delete this.goodsListSave.typeno
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  | -     
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |        console.log(this.goodsListSave);
 | 
	
		
			
				|  |  |        productLaunch(this.goodsListSave).then(res => {
 | 
	
		
			
				|  |  |          console.log(res);
 | 
	
	
		
			
				|  | @@ -619,6 +632,17 @@ export default {
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    //新增搜索
 | 
	
		
			
				|  |  | +    goodsSearchCost(params, done) {
 | 
	
		
			
				|  |  | +      this.treeDeptId = ''
 | 
	
		
			
				|  |  | +      console.log(params);
 | 
	
		
			
				|  |  | +      params = {
 | 
	
		
			
				|  |  | +        ...params,
 | 
	
		
			
				|  |  | +        // artsVision: this.form.belongToCorpId
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      this.onLoad(this.page, params);
 | 
	
		
			
				|  |  | +      done()
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      onLoad(page, params = {}) {
 | 
	
		
			
				|  |  |        console.log(this.search);
 | 
	
		
			
				|  |  |        params = {
 | 
	
	
		
			
				|  | @@ -649,7 +673,7 @@ export default {
 | 
	
		
			
				|  |  |        }).finally(() => {
 | 
	
		
			
				|  |  |          this.loading = false
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  | -      deptList().then(res=>{
 | 
	
		
			
				|  |  | +      deptList().then(res => {
 | 
	
		
			
				|  |  |          console.log(res);
 | 
	
		
			
				|  |  |          this.sharedCompanyoptions = res.data.data
 | 
	
		
			
				|  |  |        })
 |