Bläddra i källkod

指定设备禁用&表格滚动条

Shan9312 11 månader sedan
förälder
incheckning
6203220553

+ 5 - 4
src/views/basicData/equipmentTMR/index.vue

@@ -109,16 +109,17 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.imei" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" />
             <el-input v-if="scope.row.Edit" v-model="scope.row.imei" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" />
           </template>
           </template>
         </el-table-column>
         </el-table-column>
-
-        <!-- <el-table-column label="指定设备" min-width="100px" align="center">
+<!--
+"自走式", value: "1";"固定式", value: "2";撒料设备", value: "3";"小料设备", value: "4" : 固定和小科不能使用指定设备-->
+        <el-table-column label="指定设备" min-width="100px" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.appointName }}</span>
             <span v-if="scope.row.NoEdit">{{ scope.row.appointName }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.appointName" filterable placeholder="指定设备" class="filter-item" style="width:95%;padding:10px 0;" @change="changeAppoint">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.appointName" filterable placeholder="指定设备" class="filter-item" style="width:95%;padding:10px 0;" @change="changeAppoint" :disabled="scope.row.tclassid =='2' ||scope.row.tclassid =='4' ">
               <el-option v-for="item in appoinsList" :key="item.id" :label="item.tname" :value="item.id" />
               <el-option v-for="item in appoinsList" :key="item.id" :label="item.tname" :value="item.id" />
             </el-select>
             </el-select>
 
 
           </template>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column label="备注" min-width="90px" align="center">
         <el-table-column label="备注" min-width="90px" align="center">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>

+ 4 - 1
src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -88,6 +88,7 @@
             :row-style="rowStyle"
             :row-style="rowStyle"
             :cell-style="cellStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
             class="elTable table-fixed"
+            max-height="270px"
           >
           >
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
             <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
@@ -315,6 +316,7 @@
             :row-style="rowStyle"
             :row-style="rowStyle"
             :cell-style="cellStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
             class="elTable table-fixed"
+            max-height="270px"
           >
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
             <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
@@ -414,6 +416,7 @@
             :row-style="rowStyle"
             :row-style="rowStyle"
             :cell-style="cellStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
             class="elTable table-fixed"
+            max-height="270px"
           >
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
@@ -1161,7 +1164,7 @@ export default {
         }, {
         }, {
           itemWidth: 15, itemHeight: 15, right: '0', textStyle: { fontSize: 12 },
           itemWidth: 15, itemHeight: 15, right: '0', textStyle: { fontSize: 12 },
           data: [
           data: [
-            { name: '开始重量' }, 
+            { name: '开始重量' },
             { name: '结束重量' },
             { name: '结束重量' },
           ]
           ]
         }],
         }],

+ 2 - 0
src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -190,6 +190,7 @@
             :row-style="rowStyle"
             :row-style="rowStyle"
             :cell-style="cellStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
             class="elTable table-fixed"
+            max-height="270px"
           >
           >
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
             <el-table-column label="饲料名称" min-width="70px" align="center" prop="fname" />
@@ -485,6 +486,7 @@
             :row-style="rowStyle"
             :row-style="rowStyle"
             :cell-style="cellStyle"
             :cell-style="cellStyle"
             class="elTable table-fixed"
             class="elTable table-fixed"
+            max-height="270px"
           >
           >
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
             <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />