Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-13 e31a294cd6ce4cdc41a2df4a5d3994b0f14f1eb2

 src/components/view/sale.vue

@@ -132,9 +132,8 @@
         <span>状态：</span>
         <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-option label="全部" :value="null"></el-option>
            <el-option label="通过" :value="0"></el-option>
            <el-option label="不通过" :value="1"></el-option>
            <el-option label="未审核" :value="2"></el-option>
            <el-option label="通过" :value="1"></el-option>
            <el-option label="不通过" :value="0"></el-option>
         </el-select>
         <span>交货日期：</span>
         <el-date-picker v-model="search.delTime" size="small" placeholder="请输入" style="width: 224px;margin-right: 30px;"
@@ -174,7 +173,8 @@
                  <span class="table_do" @click="changeShowDetail(scope.row)">&nbsp;查看详情&nbsp;</span>
                  <span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)">&nbsp;审核&nbsp;</span>
                  <span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                  <span class="table_do" @click="openUpDia(scope.row.id)">&nbsp;编辑&nbsp;</span>
                  <span class="table_do" v-if="scope.row.type==null" @click="openUpDia(scope.row.id)">&nbsp;编辑&nbsp;</span>
                  <span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                  <span class="table_do" @click="delSale(scope.$index)">&nbsp;删除&nbsp;</span>
               </template>
            </el-table-column>
@@ -402,7 +402,7 @@
               delTime: null
            },
            tableData: [],
            selects: [],
            selects: '',
            currentPage: 1,
            countSize: 0,
            pageSize: 10,
@@ -430,7 +430,13 @@
      },
      methods: {
         handleSelectionChange(val) {
            this.selects = val.id;
            this.selects = ''
            val.forEach((a, ai)=>{
               this.selects += a.id
               if(ai!=val.length-1){
                  this.selects += ','
               }
            })
         },
         handleSizeChange(val) {
            this.pageSize = val
@@ -456,7 +462,7 @@
            })
         },
         clean() {
            this.selects = []
            this.selects = ''
            this.currentPage = 1
            this.countSize = 0
            this.pageSize = 10
@@ -464,7 +470,8 @@
               formTime: null,
               createTime: null,
               insState: 2,
               judgeState: 2
               judgeState: 2,
               type: null
            }
            this.selectRawInspectsList()
         },
@@ -565,7 +572,6 @@
            })
         },
         upSale() {
            console.log(this.addData);
            for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
               if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
                  this.addData.saleMaterialList.splice(b, 1)
@@ -581,7 +587,8 @@
               }
            }
            for (var a in this.addData) {
               if ((this.addData[a] == null || this.addData[a] == '') && a != 'type') {
               console.log(a);
               if ((this.addData[a] == null || this.addData[a] == '') && a!='checkname' && a!='checkTime' && a != 'type') {
                  if (a == 'saleMaterialList') {
                     this.$message.error('产品信息不能为空')
                  } else {
@@ -612,13 +619,12 @@
            })
         },
         delSales(){
            console.log(this.selects);
            if(this.selects=='') {
               this.$message.warning('请选择一条数据删除')
               return
            }
            this.axios.post(this.$api.url.delAllSale,{
               ids: this.selects
            }, {
               headers: {
                  'Content-Type': 'application/json'
               }
            }).then(res=>{
               this.$message.success('删除成功')
               this.selectRawInspectsList()