Merge pull request 'projects/mesxc-zhp' (#292) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: http://git.picaiba.com/mt-fe-group/yudao-dev/pulls/292

src/views/extend/processEquValueBom/statusBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-08 14:00:52
- * @LastEditTime: 2024-03-25 14:09:33
+ * @LastEditTime: 2024-03-29 08:46:42
  * @LastEditors: zhp
  * @Description:
 -->
@@ -25,24 +25,24 @@ export default {
   },
   data() {
     return {
-      // state: false
-    }
-  },
-  computed: {
-    state() {
-      return this.injectData.enabled === 1 ? true : false
+      state: false
     }
   },
+  // computed: {
+  //   state() {
+  //     return this.injectData.enabled === 1 ? true : false
+  //   }
+  // },
   mounted() {
-    // this.mapToState()
+    this.mapToState()
   },
 
   methods: {
-    // mapToState() {
-    //   if (this.injectData.prop === 'enabled') {
-    //     this.state = this.injectData.enabled === 1 ? true : false
-    //   }
-    // },
+    mapToState() {
+      if (this.injectData.prop === 'enabled') {
+        this.state = this.injectData.enabled === 1 ? true : false
+      }
+    },
     changeHandler() {
       // let params = {}
       let payload = {}

src/views/report/glass/inputTable.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-13 14:10:04
- * @LastEditTime: 2024-03-27 09:22:51
+ * @LastEditTime: 2024-03-29 09:43:52
  * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <div>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!edit" size="small" @click="edit = true">编辑</el-button>
+      <el-button v-if="!edit" :disabled="noData" size="small" @click="edit = true">编辑</el-button>
       <el-button v-if="edit" size="small" @click="handleReturn()">返回</el-button>
       <el-button v-if="edit" size="small" @click="updateData">保存</el-button>
     </el-row>
@@ -20,7 +20,7 @@
           <el-table-column v-for="(y, index2) in it.children" :key="index2" :prop="y.prop" :label="y.label">
             <template slot-scope="scope">
               <span v-if="!edit">{{ scope.row[y.prop] }}</span>
-              <el-input @change="handleChange" :disabled="y.prop == 'dailyOutputTrend' || y.prop === 'originalGlassStatisticsTrend'
+              <el-input type="number" @change="handleChange" :disabled="y.prop == 'dailyOutputTrend' || y.prop === 'originalGlassStatisticsTrend'
                  || y.prop === 'actualProductTrend' || y.prop === 'originalGlassPassTrend' || y.prop === 'originalGlassPassNow' || y.prop === 'originalGlassPassHis'
               " v-else v-model="scope.row[y.prop]"></el-input>
             </template>
@@ -158,9 +158,19 @@ const cols = [
         cols,
         remark:null,
         edit: false,
+        noData:false,
       };
     },
-    watch: {
+  watch: {
+    data: {
+      handler(newv, oldv) {
+        if (newv.length != 0) {
+          this.noData = false
+        } else {
+          this.noData = true
+        }
+      }
+      },
       time: {
         immediate: true,
         handler(newv, oldv) {

src/views/report/productionDayReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-27 09:21:00
+ * @LastEditTime: 2024-03-29 09:48:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -17,7 +17,7 @@
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -28,59 +28,61 @@
       <el-table-column :label="'许昌安彩日成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineName" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' :
-              null}} </span>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? parseFloat((scope.row.inputTrend *
+              100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 : null }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) +
-              '%' : null }} </span>
+              <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
+                parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
               100).toFixed(2)) +
               '%' : null }}
@@ -89,7 +91,7 @@
           </el-table-column>
           <el-table-column prop="missCheckHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
               100).toFixed(2)) +
               '%' : null }}
@@ -98,19 +100,18 @@
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
-              100).toFixed(2)) +
-              '%' : null }}
-              </span>
+              <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ? 0 : null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="今日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
               100).toFixed(2)) +
@@ -120,7 +121,7 @@
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="昨日" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
               100).toFixed(2)) +
@@ -130,12 +131,13 @@
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
-                            100).toFixed(2)) +
-              '%' : null }}
-              </span>
+              <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
+              parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -284,6 +286,7 @@ export default {
       urlOptions: {
         exportURL: exportProductExcel
       },
+      noData:false,
       isSave:false,
       disabled: true,
       sumArr: [],
@@ -631,6 +634,11 @@ export default {
         params: this.listQuery
       })
       console.log(res)
+      if (res.data.list.length == 0) {
+        this.noData = true
+      } else {
+        this.noData = false
+      }
       // let sum = undefined
       // res.data.list.forEach((ele, index) => {
       //   if (ele.det === false) {

src/views/report/productionMonthReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-26 09:41:33
+ * @LastEditTime: 2024-03-29 09:48:32
  * @LastEditors: zhp
  * @Description:
 -->
@@ -17,7 +17,7 @@
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -28,114 +28,122 @@
       <el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="本月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="上月" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -288,6 +296,7 @@ export default {
       isSave:false,
       disabled: true,
       sumArr: [],
+      noData:false,
       timeTips:'',
       searchBarFormConfig: [
         // {
@@ -666,6 +675,11 @@ export default {
         params: this.dataForm
       })
       console.log(res)
+      if (res.data.list.length == 0) {
+        this.noData = true
+      } else {
+        this.noData = false
+      }
       // let sum = undefined
       // res.data.list.forEach((ele, index) => {
       //   if (ele.det === false) {

src/views/report/productionShipmentsReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-18 15:26:52
+ * @LastEditTime: 2024-03-29 08:51:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -25,7 +25,7 @@
       background: '#F2F4F9',
       color: '#606266'
     }">
-      <el-table-column :label="'许昌安彩周成品发货及库存日报' + '(' + timeTips + ')'" align="center">
+      <el-table-column :label="'许昌安彩成品发货及库存日报' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="glassType" label="品种" align="center">
           <template slot-scope="scope">
             <el-input v-if="!disabled" v-model="scope.row.glassType" :disabled="disabled"></el-input>
@@ -39,7 +39,7 @@
           </template>
         </el-table-column>
         <el-table-column label="规格" align="center">
-          <el-table-column label="成品" align="center">
+          <el-table-column width="180"  label="成品" align="center">
             <!-- <el-table-column :show-header="false"> -->
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.productionGlassSize" :disabled="disabled"></el-input>
@@ -59,7 +59,7 @@
               </template>
             </el-table-column> -->
           </el-table-column>
-          <el-table-column prop="originalGlassSize" label="原片" align="center">
+          <el-table-column width="180" prop="originalGlassSize" label="原片" align="center">
             <!-- <el-table-column prop="originalGlassSize"> -->
             <template slot-scope="scope">
               <el-input v-if="!disabled" v-model="scope.row.originalGlassSize" :disabled="disabled">

src/views/report/productionWeekReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-26 09:41:51
+ * @LastEditTime: 2024-03-29 09:48:41
  * @LastEditors: zhp
  * @Description:
 -->
@@ -20,7 +20,7 @@
         @click="handleExport">导出</el-button>
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -31,114 +31,126 @@
       <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="本周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="上周" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -296,6 +308,7 @@ export default {
       isSave:false,
       disabled: true,
       sumArr: [],
+      noData:false,
       weekValue1: null,//最多24周
       weekValue2: null,
       searchBarFormConfig: [
@@ -629,6 +642,11 @@ export default {
       })
       // console.log(this.queryParams);
       console.log(res)
+      if (res.data.list.length == 0) {
+        this.noData = true
+      } else {
+        this.noData = false
+      }
       // let sum = undefined
       // res.data.list.forEach((ele, index) => {
       //   if (ele.det === false) {

src/views/report/productionYearReport/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-26 09:42:08
+ * @LastEditTime: 2024-03-29 09:48:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -21,7 +21,7 @@
       <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
     </el-form>
     <el-row style="float: right; margin-bottom: 5px">
-      <el-button v-if="!isSave" size="small" @click="editDataList()">编辑</el-button>
+      <el-button v-if="!isSave" :disabled="noData" size="small" @click="editDataList()">编辑</el-button>
       <el-button v-if="isSave" size="small" @click="handleReturn()">返回</el-button>
       <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
     </el-row>
@@ -33,114 +33,126 @@
       <el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center">
         <el-table-column prop="lineId" label="生产线" align="center">
           <template slot-scope="scope">
-            <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
+            <el-input  v-if="!disabled"  type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
             <span v-else>{{ scope.row.lineName }} </span>
           </template>
         </el-table-column>
         <el-table-column label="投入数㎡" align="center">
           <el-table-column prop="inputNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.inputHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="inputTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend ? parseFloat((scope.row.inputTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
+              <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
+              parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="完成良品产量" align="center">
           <el-table-column prop="goodProductNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductNow }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductHis }} </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductTrend ? parseFloat((scope.row.goodProductTrend *
-                100).toFixed(2)) + '%' : undefined }} </span>
+              <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
+              parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="原片漏检率" align="center">
           <el-table-column prop="missCheckNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
               <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="missCheckTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.missCheckTrend ? parseFloat((scope.row.missCheckTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
+              parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="综合良品率" align="center">
           <el-table-column prop="goodProductPassNow" label="今年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassHis" label="去年" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
               </el-input>
               <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
-                100).toFixed(2)) +
-                '%' : undefined }}
+              100).toFixed(2)) +
+              '%' : null }}
               </span>
             </template>
           </el-table-column>
           <el-table-column prop="goodProductPassTrend" label="增减" align="center">
             <template slot-scope="scope">
-              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
+              <el-input  v-if="!disabled"  type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
               </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend ? parseFloat((scope.row.goodProductPassTrend *
-                100).toFixed(2)) +
-                '%' : undefined }}
-              </span>
+              <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
+                parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
+              0 ?
+              0 :
+              null
+              }} </span>
             </template>
           </el-table-column>
         </el-table-column>
@@ -291,6 +303,7 @@ export default {
       yearValue2: null,
       // dynamicProps: [],
       tableProps,
+      noData:false,
       reportTime: [],
       startTimeStamp: '',
       endTimeStamp: '',
@@ -567,7 +580,12 @@ export default {
       })
       // console.log(this.queryParams);
       console.log(res)
-      let sum = undefined
+      if (res.data.list.length == 0) {
+        this.noData = true
+      } else {
+        this.noData = false
+      }
+      // let sum = undefined
       // res.data.list.forEach((ele, index) => {
       //   if (ele.det === false) {
       //    sum = res.data.list.splice(index, 1)