修改

zhouwx

6 days ago 9cf27cf09dbf8e78ab39693941a0987ec6934dc9

修改

 src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue

@@ -19,14 +19,14 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="年份:" prop="year">
          <el-date-picker
              v-model="state.form.year"
              type="year"
              value-format="YYYY"
              placeholder="年份"
          />
        </el-form-item>
<!--        <el-form-item label="年份:" prop="year">-->
<!--          <el-date-picker-->
<!--              v-model="state.form.year"-->
<!--              type="year"-->
<!--              value-format="YYYY"-->
<!--              placeholder="年份"-->
<!--          />-->
<!--        </el-form-item>-->
        <el-row>
          <el-col :span="12">
            <el-form-item label="材料名称:" prop="materialId">
@@ -194,7 +194,7 @@
    recordName: '',
    inventory: null,
    warehousingRecordDetails: [],
    year:new Date().getFullYear().toString(),
    // year:new Date().getFullYear().toString(),
    delDetails: []
  },
  oldDeviceList: [],
@@ -202,7 +202,7 @@
    companyId: [{ required: true, message: '请选择企业', trigger: 'blur' }],
    materialId: [{ required: true, message: '请选择材料',  trigger: 'blur' }],
    warehousingRecordDetails: [{ required: true, validator: checkList, trigger: 'blur' }],
    year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
    // year: [{ required: true, message: '请选择年份', trigger: 'blur' }],
  },
  isAdmin: false,
  companyList: [],
@@ -416,7 +416,7 @@
    recordName: '',
    inventory: null,
    warehousingRecordDetails: [],
    year:new Date().getFullYear().toString(),
    // year:new Date().getFullYear().toString(),
    delDetails: []
  }
  state.originInventory = 0

 src/views/work/qualityInfo/inventoryRecord/index.vue

@@ -21,14 +21,14 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="年份:" style="margin-left: 20px">
          <el-date-picker
              v-model="data.queryParams.year"
              type="year"
              value-format="YYYY"
              placeholder="请选择年份"
          />
        </el-form-item>
<!--        <el-form-item label="年份:" style="margin-left: 20px">-->
<!--          <el-date-picker-->
<!--              v-model="data.queryParams.year"-->
<!--              type="year"-->
<!--              value-format="YYYY"-->
<!--              placeholder="请选择年份"-->
<!--          />-->
<!--        </el-form-item>-->
        <el-form-item >
          <el-button  type="primary" @click="getList">查询</el-button>
          <el-button  type="primary" plain @click="reset">重置</el-button>
@@ -39,7 +39,7 @@
    <!-- 表格数据 -->
    <el-table v-loading="loading" :data="dataList" :border="true">
      <el-table-column type="index" label="序号" width="80"/>
      <el-table-column prop="year" align="center" label="年份"/>
<!--      <el-table-column prop="year" align="center" label="年份"/>-->
      <el-table-column prop="recordName" align="center" label="材料名称"/>
      <el-table-column prop="inventory" align="center" label="当前库存"/>
      <el-table-column label="操作" align="center">
@@ -88,7 +88,7 @@
    pageNum: 1,
    pageSize: 10,
    companyId: null,
    year:''
    // year:''
  },
  total: 0,
  dataList: [],
@@ -106,12 +106,12 @@
    data.isAdmin = false
    data.queryParams.companyId = userStore.companyId
  }
  await getNowYear()
  // await getNowYear()
  await getList()
})
const getNowYear = () =>{
  data.queryParams.year = new Date().getFullYear().toString()
}
// const getNowYear = () =>{
//   data.queryParams.year = new Date().getFullYear().toString()
// }
onUnmounted(()=>{

})
@@ -312,7 +312,7 @@
      pageNum: 1,
      pageSize: 10,
      companyId: null,
      year: '',
      // year: '',
    }
    await getCompanyList()
  }else {
@@ -320,10 +320,10 @@
      pageNum: 1,
      pageSize: 10,
      companyId: data.queryParams.companyId,
      year: '',
      // year: '',
    }
  }
  await getNowYear()
  // await getNowYear()
  await getList()
}
const handleDelete = (val) => {