功能升级2

src/api/mes/reportWork.js

@@ -306,7 +306,7 @@ export function getPrepareList(query) {
 
 // 获取线体每月生产过程不良率
 export function getLineQcData() {
-	return requestnpm({
+	return request({
 		url: '/quality/qcInterface/getLineQcData',
 		method: 'get'
 	});

src/layout/components/Navbar.vue

@@ -313,14 +313,14 @@ export default {
     setInterval(() => this.getAlarmData(), 1000 * 60);
     this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
     this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
-    /**
+
     //先执行一次
     this.getUnReadList();
     // 实现轮询
     this.timer = setInterval(() => {
       setTimeout(this.getUnReadList(), 30000);
     }, 30000);
-    **/
+
 
   },
   components: {

src/views/dashboard/QcChartLine.vue

@@ -50,7 +50,7 @@
 
     methods: {
       getLineQcInfo(){
-        getLineQcData().then(returnData => {
+        getLineQcData().then((returnData) => {
            const chart = this.$refs.chart
             if (chart) {
               const myChart = this.$echarts.init(chart)

src/views/dashboard/crossBarChart.vue

@@ -123,6 +123,7 @@ export default {
             inverse: true,
             axisLabel: {
               show: true,
+              interval: 0, 
               margin: 10,
               textStyle: {
                 fontSize: "14",

src/views/index.vue

@@ -53,52 +53,6 @@
         <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
       </div>
     </div>
-    <!-- <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <span style="font-size: 20px; margin: 40%; color: cadetblue">{{
-          titlename
-        }}</span>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="24">
-        <div style="border: 1px solid #cfdee4">
-          <line-chart :chart-data="lineChartData" ref="lineChart" />
-        </div>
-      </el-col>
-    </el-row> -->
-    <!--
-     <el-row :gutter="20">
-      <el-col :span="12">
-        <pie-chart ref="pieChart"/>
-      </el-col>
-      <el-col :span="12">
-        <pie-chart ref="pieChart2"/>
-      </el-col>
-    </el-row>-->
-    <!-- <el-row :gutter="20">
-      <el-col :span="12">
-        <span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
-          >各线体设备月故障数</span
-        >
-      </el-col>
-      <el-col :span="12">
-        <span style="font-size: 18px; padding: 1% 39%; color: cadetblue"
-          >各车间生产不良率</span
-        >
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <DeviceChartLine
-          :chart-data="deviceChartLineData"
-          ref="DeviceChartLine"
-        />
-      </el-col>
-      <el-col :span="12">
-        <QcChartLine :chart-data="qcChartLineData" ref="QcChartLine" />
-      </el-col>
-    </el-row> -->
   </div>
 </template>
 

src/views/quality/qcInventory/index.vue

@@ -391,6 +391,7 @@ export default {
 		getCheckTypes() {
            	getCheckTypes('inventory').then(response => {
 				this.checkTypes = response;
+				
 			});
 		},
         /**获取默认查询时间段**/
@@ -495,6 +496,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.form.defects = this.defectTypeList;
+			this.form.checkType = 'checkTypeCC';
 			this.open = true;
 			this.title = "添加库存检验";
 		},

src/views/quality/qcInventory/selectPutInOrder.vue

@@ -27,6 +27,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <!--
            <el-form-item label="订单号">
             <el-input
               v-model="queryParams.workorderCodeSap"
@@ -35,6 +36,18 @@
               style="width: 150px"
               @keyup.enter.native="handleQuery"
             />
+            </el-form-item>
+            -->
+          <el-form-item label="入库时间">    
+            <el-date-picker
+              v-model="queryParams.incomeTimeArray"
+              format="yyyy-MM-dd"
+              type="datetimerange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
           </el-form-item>
           <el-form-item label="仓库名称">
             <el-select v-model="queryParams.supplierCode" placeholder="请选择仓库" width="50%" clearable>
@@ -82,7 +95,7 @@
   </el-dialog>
 </template>
 <script>
-
+import moment from "moment/moment";
 import { getPutInOrder,getWarehouseList } from "@/api/quality/income";
 export default {
   name: "itemPutInOrder",
@@ -112,7 +125,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        workorderCode: ''
+        workorderCode: '',
+        incomeTimeArray: [],
       },
       selectionRow:{},
       cwarehouseList: [],
@@ -127,7 +141,14 @@ export default {
 
     /** 查询表格列表*/
     getList() {
+      debugger
       this.loading = true;
+
+      if (this.queryParams.incomeTimeArray.length > 0) {
+        this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format("YYYY-MM-DD");
+        this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format("YYYY-MM-DD");
+      }
+
       getPutInOrder(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;