Merge remote-tracking branch 'origin/master'

value

2023-09-07 523d7a54fb07fdf756fbc4faa5eb7fef7263a556

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -4,27 +4,27 @@
         <div class="top-bar">
            <el-form ref="form" :inline="true" :model="searchData">
               <el-form-item label="材料编码:" position="left" class="sermargin">
                  <el-input v-model="searchData.code" class="input-form" placeholder="请输入">
                  <el-input size="small" v-model="searchData.code" class="input-form" placeholder="请输入">
                  </el-input>
               </el-form-item>
               <el-form-item label="材料名称:" class="sermargin">
                  <el-input v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
                  <el-input size="small" v-model="searchData.name" class="input-form" placeholder="请输入材料名称">
                  </el-input>
               </el-form-item>
               <el-form-item label="状态:" class="sermargin">
                  <el-select v-model="searchData.state" placeholder="全部">
                  <el-select size="small" v-model="searchData.state" placeholder="全部">
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                  </el-select>
               </el-form-item>
               <el-form-item label="来料日期:" style="margin-right: 20px;">
                  <el-date-picker value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
                  <el-date-picker size="small" value-format="yyyy-MM-dd" v-model="searchData.date" class="input-form" placeholder="请选择来料日期">
                  </el-date-picker>
               </el-form-item>
               <el-form-item>
                  <el-button type="primary" @click="search">查询</el-button>
                  <el-button type="primary" plain @click="reset">重置</el-button>
                  <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
                  <el-button size="small" type="primary" @click="search">查询</el-button>
                  <el-button size="small" type="primary" plain @click="reset">重置</el-button>
                  <el-button size="small" type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
               </el-form-item>
            </el-form>
         </div>
@@ -48,7 +48,7 @@
               </el-form-item>
               <el-form-item label="规格型号:" prop="specificationsNumber">
                  <el-cascader v-model="insertData.specificationsNumber" :options="childrenOptions"
                     :props="{label: 'Name', value: 'Name'}" separator="-"></el-cascader>
                     :props="{label: 'Name', value: 'Id'}" separator="-"></el-cascader>
               </el-form-item>
               <el-form-item label="单位:" prop="unit">
                  <el-input type="text" v-model="insertData.unit" />
@@ -156,6 +156,7 @@
    getChooseVersion,
    lookProByVer
   } from '@/api/inspection/rawmaterial'
import ItemVue from '@/layout/components/Sidebar/Item.vue'
   export default {
      data() {
         return {
@@ -412,8 +413,7 @@
               "unit": val.unit,
               "version": this.addInspectionForm.version
               }
               // this.createReport(obj);
               console.log("obj---",obj);
               this.createReport(obj);
               this.addReportDialog = false;
            }
            }));
@@ -480,13 +480,25 @@
         insert() {
            this.$refs['addMaterialForm'].validate((valid) => {
               if (valid) {
                  console.log(this.childrenOptions);
                  console.log(this.insertData);
                  let f=this.childrenOptions.filter(item=>{
                     return item.Id===this.insertData.specificationsNumber[0]
                  })[0]
                  console.log(f);
                  let fatherName=f.Name;
                  let c=f.children.filter(item=>{
                     return item.Id===this.insertData.specificationsNumber[1]
                  })[0]
                  let sonName=c.Name
                  let specificationsId=c.Id;
                  var str = {
                     "dateSurvey": this.insertData.fromDate,
                     "materialCoding": this.insertData.mCode,
                     "materialName": this.insertData.mName,
                     "quantity": this.insertData.num,
                     "specificationsModels": this.insertData.specificationsNumber[0] + '-' + this.insertData
                        .specificationsNumber[1],
                     "specificationsModels": fatherName+ '-' + sonName,
                     "specificationsId": specificationsId,	
                     "supplierName": this.insertData.supplierName,
                     "type": 0,
                     "unit": this.insertData.unit