1122

src/views/ButchAdmin/ButchAdmin.vue

@@ -100,14 +100,6 @@
             <template v-if="scope.row.inspecFlowStatus === 1">
               <el-tag type="warning">未处理</el-tag>
             </template>
-            <template v-else>
-              <template v-if="scope.row.inspecFlowStatus === 2">
-                <el-tag type="success">屠宰合格</el-tag>
-              </template>
-              <template v-if="scope.row.recordStatus === 5">
-                <el-tag type="danger">屠宰不合格</el-tag>
-              </template>
-            </template>
           </template>
           <template #handler="scope">
             <el-button type="primary" size="mini" v-if="scope.row.inspecFlowStatus === 1" @click="onConfirm(scope.row)">去审批</el-button>
@@ -135,17 +127,15 @@
             <span>{{getFarmName(parseInt(scope.row.inspecOrgId))}}</span>
           </template>
           <template #status="scope">
-            <template v-if="scope.row.inspecFlowStatus === 1">
-              <el-tag type="warning">未处理</el-tag>
-            </template>
-            <template v-else>
-              <template v-if="scope.row.inspecFlowStatus === 2">
+
+
+              <template v-if="scope.row.recordStatus === 3">
                 <el-tag type="success">屠宰合格</el-tag>
               </template>
               <template v-if="scope.row.recordStatus === 5">
                 <el-tag type="danger">屠宰不合格</el-tag>
               </template>
-            </template>
+
           </template>
           <template #handler="scope">
             <el-button type="primary" size="mini" v-if="scope.row.inspecFlowStatus === 1" @click="onConfirm(scope.row)">去审批</el-button>
@@ -173,17 +163,13 @@
             <span>{{getFarmName(parseInt(scope.row.inspecOrgId))}}</span>
           </template>
           <template #status="scope">
-            <template v-if="scope.row.inspecFlowStatus === 1">
-              <el-tag type="warning">未处理</el-tag>
-            </template>
-            <template v-else>
-              <template v-if="scope.row.inspecFlowStatus === 2">
+
+              <template v-if="scope.row.recordStatus === 3">
                 <el-tag type="success">屠宰合格</el-tag>
               </template>
               <template v-if="scope.row.recordStatus === 5">
                 <el-tag type="danger">屠宰不合格</el-tag>
               </template>
-            </template>
           </template>
           <template #handler="scope">
             <el-button type="primary" size="mini" v-if="scope.row.inspecFlowStatus === 1" @click="onConfirm(scope.row)">去审批</el-button>

src/views/SellPig/SellRecord.vue

@@ -46,6 +46,9 @@
     <el-tabs type="border-card" v-model="activeName">
       <el-tab-pane label="全部" name="0">
         <NewTable :title="'售猪记录'" :table-items="tableItems" :list-data="tableData">
+          <template #batchNo="scope">
+            <span @click="jump(scope.row)" style="color: #66b1ff; cursor: pointer">{{scope.row.batchNo}}</span>
+          </template>
           <template #handle="scope">
             <el-button v-if="scope.row.recordStatus !== 0" type="text" @click="open(scope.row)">查看</el-button>
             <el-button type="primary" v-else @click="onConfirm(scope.row)">提交申请</el-button>
@@ -74,18 +77,21 @@
             <span>{{getFarmName(scope.row.butcherOrgId)}}</span>
           </template>
           <template #autoEartagNum="scope">
-            <span style="color: #66b1ff; cursor: pointer" @click="jump(scope.row)">{{scope.row.autoEartagNum}}</span>
+            <span>{{scope.row.autoEartagNum}}</span>
           </template>
         </NewTable>
         <TableFooter
           :size="pageSize"
-          :total="total"
+          :totals="total"
           @sizeChange="sizeChange"
           @pageChange="pageChange"
         ></TableFooter>
       </el-tab-pane>
       <el-tab-pane label="未提交" name="1">
         <NewTable :title="'售猪记录'" :table-items="tableItems" :list-data="tableData">
+          <template #batchNo="scope">
+            <span @click="jump(scope.row)" style="color: #66b1ff; cursor: pointer">{{scope.row.batchNo}}</span>
+          </template>
           <template #handle="scope">
             <el-button type="primary" @click="onConfirm(scope.row)">提交申请</el-button>
 <!--            <el-button type="text" @click="open">查看</el-button>-->
@@ -114,18 +120,21 @@
             <span>{{getFarmName(scope.row.butcherOrgId)}}</span>
           </template>
           <template #autoEartagNum="scope">
-            <span style="color: #66b1ff; cursor: pointer" @click="jump(scope.row)">{{scope.row.autoEartagNum}}</span>
+            <span>{{scope.row.autoEartagNum}}</span>
           </template>
         </NewTable>
         <TableFooter
           :size="pageSize"
-          :total="total"
+          :totals="total"
           @sizeChange="sizeChange"
           @pageChange="pageChange"
         ></TableFooter>
       </el-tab-pane>
       <el-tab-pane label="进行中" name="2">
         <NewTable :title="'售猪记录'" :table-items="tableItems" :list-data="tableData">
+          <template #batchNo="scope">
+            <span @click="jump(scope.row)" style="color: #66b1ff; cursor: pointer">{{scope.row.batchNo}}</span>
+          </template>
           <template #handle="scope">
             <el-button type="text" @click="open(scope.row)">查看</el-button>
           </template>
@@ -153,18 +162,21 @@
             <span>{{getFarmName(scope.row.butcherOrgId)}}</span>
           </template>
           <template #autoEartagNum="scope">
-            <span style="color: #66b1ff; cursor: pointer" @click="jump(scope.row)">{{scope.row.autoEartagNum}}</span>
+            <span>{{scope.row.autoEartagNum}}</span>
           </template>
         </NewTable>
         <TableFooter
           :size="pageSize"
-          :total="total"
+          :totals="total"
           @sizeChange="sizeChange"
           @pageChange="pageChange"
         ></TableFooter>
       </el-tab-pane>
       <el-tab-pane label="已完成" name="3">
         <NewTable :title="'售猪记录'" :table-items="tableItems" :list-data="tableData">
+          <template #batchNo="scope">
+            <span @click="jump(scope.row)" style="color: #66b1ff; cursor: pointer">{{scope.row.batchNo}}</span>
+          </template>
           <template #handle="scope">
             <el-button type="text" @click="open(scope.row)">查看</el-button>
           </template>
@@ -192,19 +204,22 @@
             <span>{{getFarmName(scope.row.butcherOrgId)}}</span>
           </template>
           <template #autoEartagNum="scope">
-            <span style="color: #66b1ff; cursor: pointer" @click="jump(scope.row)">{{scope.row.autoEartagNum}}</span>
+            <span>{{scope.row.autoEartagNum}}</span>
           </template>
         </NewTable>
 
         <TableFooter
           :size="pageSize"
-          :total="total"
+          :totals="total"
           @sizeChange="sizeChange"
           @pageChange="pageChange"
         ></TableFooter>
       </el-tab-pane>
       <el-tab-pane label="失败" name="4">
         <NewTable :title="'售猪记录'" :table-items="tableItems" :list-data="tableData">
+          <template #batchNo="scope">
+            <span @click="jump(scope.row)" style="color: #66b1ff; cursor: pointer">{{scope.row.batchNo}}</span>
+          </template>
           <template #handle="scope">
             <el-button type="text" @click="open(scope.row)">查看</el-button>
           </template>
@@ -232,12 +247,12 @@
             <span>{{getFarmName(scope.row.butcherOrgId)}}</span>
           </template>
           <template #autoEartagNum="scope">
-            <span style="color: #66b1ff; cursor: pointer" @click="jump(scope.row)">{{scope.row.autoEartagNum}}</span>
+            <span>{{scope.row.autoEartagNum}}</span>
           </template>
         </NewTable>
         <TableFooter
           :size="pageSize"
-          :total="total"
+          :totals="total"
           @sizeChange="sizeChange"
           @pageChange="pageChange"
         ></TableFooter>
@@ -248,51 +263,116 @@
       <el-steps :active="now"  finish-status="success" :process-status="openList.recordStatus > 3 ? 'error' : 'success'">
         <el-step v-for="(item, i) in stepList" :key="i" :title="item.title" :description="item.subTitle"></el-step>
       </el-steps>
-      <el-form>
-        <el-form-item label-width="80" label="检疫部门">
-          <span>{{getFarmName(openList.inspecOrgId)}}</span>
-        </el-form-item>
-        <el-form-item label-width="80" label="屠宰部门">
-          <span>{{getFarmName(openList.butcherOrgId)}}</span>
-        </el-form-item>
-        <el-form-item label-width="80" label="实际数量">
-          <span>{{openList.realEartagNum}}</span>
-        </el-form-item>
-        <el-form-item label-width="80" label="运输车辆">
-          <span>{{openList.plateNumber}}</span>
-        </el-form-item>
-        <el-form-item label-width="80" label="检疫部门检疫结果">
-          <template v-if="openList.inspecTime">
-            <template v-if="openList.recordStatus === 4">
-              <el-tag type="danger">检疫失败</el-tag>
-              <el-button type="text" @click="openChildren">查看图片</el-button>
-            </template>
-            <template v-else>
-              <el-tag type="success">检疫成功</el-tag>
-              <el-button type="text" @click="openChildren">查看图片</el-button>
-            </template>
-          </template>
-          <template v-else>
-            <el-tag>暂未检疫</el-tag>
-          </template>
-        </el-form-item>
-        <el-form-item label-width="80" label="屠宰部门检疫结果">
-          <template v-if="openList.butcherTime">
-            <template v-if="openList.recordStatus === 5">
-              <el-tag type="danger">检疫失败</el-tag>
-              <el-button type="text" @click="openChildren">查看图片</el-button>
-            </template>
-            <template v-else>
-              <el-tag type="success">检疫成功</el-tag>
-              <el-button type="text" @click="openChildren">查看图片</el-button>
-            </template>
-          </template>
-          <template v-else>
-            <el-tag>暂未检疫</el-tag>
-          </template>
-        </el-form-item>
-      </el-form>
-      <el-dialog width="30%" title="内层 Dialog" :visible.sync="innerVisible" append-to-body></el-dialog>
+      <br>
+      <div class="case">
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>批次编号</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span @click="jump(openList)" style="cursor: pointer; color: #009cff">{{openList.batchNo}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>检疫部门</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{getFarmName(openList.inspecOrgId)}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>屠宰部门</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{getFarmName(openList.butcherOrgId)}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>自动采集数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{openList.autoEartagNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>填报数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{openList.realEartagNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>运输车辆</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{openList.plateNumber}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>检疫部门检疫结果</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <template v-if="openList.inspecTime">
+                <template v-if="openList.recordStatus === 4">
+                  <el-tag type="danger">检疫失败</el-tag>
+                  <el-button type="text" v-if="inspecPic !== null" @click="openChildren(inspecPic)">查看图片</el-button>
+                </template>
+                <template v-else>
+                  <el-tag type="success">检疫成功</el-tag>
+                  <el-button type="text" v-if="inspecPic !== null" @click="openChildren(inspecPic)">查看图片</el-button>
+                </template>
+              </template>
+              <template v-else>
+                <el-tag>暂未检疫</el-tag>
+              </template>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>屠宰部门检疫结果</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <template v-if="openList.butcherTime">
+                <template v-if="openList.recordStatus === 5">
+                  <el-tag type="danger">检疫失败</el-tag>
+                  <el-button type="text" v-if="butcherPic !== null" @click="openChildren(butcherPic)">查看图片</el-button>
+                </template>
+                <template v-else>
+                  <el-tag type="success">检疫成功</el-tag>
+                  <el-button type="text" v-if="butcherPic !== null" @click="openChildren(butcherPic)">查看图片</el-button>
+                </template>
+              </template>
+              <template v-else>
+                <el-tag>暂未检疫</el-tag>
+              </template>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+      <el-dialog width="30%" title="查看图片" :visible.sync="innerVisible" append-to-body :close-on-click-modal="false">
+        <img v-for="item in imgList" :src="'http://122.112.212.35:8092' + item.photoPath" :key="item.id" alt="">
+      </el-dialog>
     </el-dialog>
     <!--  暂存  -->
     <el-dialog width="30%" :close-on-click-modal="false" title="出售申请" :visible.sync="confirmShow">
@@ -347,7 +427,8 @@ export default {
       tableItems: [
         {
           label: '批次编号',
-          prop: 'batchNo'
+          prop: 'batchNo',
+          slotName: 'batchNo'
         },
         {
           label: '申请时间',
@@ -465,7 +546,10 @@ export default {
       butchList: [],
       confirmShow: false,
       batchNo: '',
-      isShow: false
+      isShow: false,
+      butcherPic: null,
+      inspecPic: null,
+      imgList: [],
     }
   },
   computed: {
@@ -498,10 +582,13 @@ export default {
         if(res.code === 10000) {
           this.stepList = res.data.data;
           this.now = res.data.now;
+          this.inspecPic = res.data.inspecPic;
+          this.butcherPic = res.data.butcherPic;
         }
       })
     },
-    openChildren() {
+    openChildren(item) {
+      this.imgList = item
       this.innerVisible = true
     },
     init() {
@@ -528,6 +615,7 @@ export default {
         if(res.code === 10000) {
           this.tableData = res.data.records;
           this.total = res.data.total;
+          console.log(this.total)
         }
       })
     },
@@ -645,4 +733,17 @@ export default {
     display: flex;
     text-align: center;
   }
+  .case {
+    width: 910px;
+    border: 1px solid #ddd;
+  }
+  .case-bottom {
+    border-bottom: 1px solid #ddd;
+    padding: 10px 0;
+    text-align: center;
+    font-size: 18px;
+  }
+  .leftBorder {
+    border-left: 1px solid #ddd;
+  }
 </style>

src/views/eartag-admin/eartag-detail/chart/ChartTemp.vue

@@ -162,6 +162,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$echarts)
     this.myCharts = this.$echarts.init(document.getElementById('chart-temp'));
     this.init();
     window.onresize = () => {

src/views/vaccine-admin/VaccineAdmin.vue

@@ -134,11 +134,11 @@
             <span>{{getFarmLocation(scope.row.farmId)}}</span>
           </template>
           <template #status="scope">
-            <template v-if="scope.row.inspecFlowStatus > 0">
+            <template v-if="scope.row.inspecFlowStatus === 0">
               <el-tag type="warning">未处理</el-tag>
             </template>
             <template v-else>
-              <template v-if="scope.row.inspecFlowStatus === 1">
+              <template v-if="scope.row.inspecFlowStatus > 0">
                 <el-tag type="success">检疫合格</el-tag>
               </template>
               <template v-if="scope.row.recordStatus === 4">
@@ -277,22 +277,115 @@
       </div>
     </el-dialog>
     <el-dialog title="批次详情" :visible.sync="textShow" :close-on-click-modal="false">
-      <el-form>
-        <el-form-item label="批次编号">{{selectItem.batchNo}}</el-form-item>
-        <el-form-item label="申请时间">{{selectItem.sellTime}}</el-form-item>
-        <el-form-item label="申请牧场名称">{{getFarmName(selectItem.farmId)}}</el-form-item>
-        <el-form-item label="处理时间">{{selectItem.inspecTime}}</el-form-item>
-        <el-form-item label="处理结果">
-          <template v-if="selectItem.inspecFlowStatus === 1">
-            <el-tag type="success">检疫合格</el-tag>
-            <el-button style="margin-left: 5px" size="mini" type="primary" v-if="inspecImgList.length > 0"  @click="openImg(1)">查看图片</el-button>
-          </template>
-          <template v-if="selectItem.recordStatus === 4">
-            <el-tag type="danger">检疫不合格</el-tag>
-            <el-button style="margin-left: 5px" size="mini" type="primary" v-if="inspecImgList.length > 0"  @click="openImg(1)">查看图片</el-button>
-          </template>
-        </el-form-item>
-      </el-form>
+      <div class="case">
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>批次编号</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span @click="openEartag(selectItem)" style="cursor: pointer; color: #009cff">{{selectItem.batchNo}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>申请时间</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.sellTime}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>申请牧场名称</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{getFarmName(selectItem.farmId)}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>牧场自动采集数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.autoEartagNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>牧场实际填报数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.realEartagNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>检疫自动采集数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.inspecAutoNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>检疫实际填报数量</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.inspecRealNum}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>运输车辆</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.plateNumber}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>处理时间</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <span>{{selectItem.inspecTime}}</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="case-bottom">
+          <el-row >
+            <el-col :span="12">
+              <span>检疫结果</span>
+            </el-col>
+            <el-col :span="12" class="leftBorder">
+              <template v-if="selectItem.inspecFlowStatus > 0 && selectItem.recordStatus !== 4">
+                <el-tag type="success">检疫合格</el-tag>
+                <el-button style="margin-left: 5px" size="mini" type="primary" v-if="inspecImgList.length > 0"  @click="openImg(1)">查看图片</el-button>
+              </template>
+              <template v-if="selectItem.recordStatus === 4">
+                <el-tag type="danger">检疫不合格</el-tag>
+                <el-button style="margin-left: 5px" size="mini" type="primary" v-if="inspecImgList.length > 0"  @click="openImg(1)">查看图片</el-button>
+              </template>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
       <el-dialog title="查看图片" :visible.sync="imgShow" append-to-body :close-on-click-modal="false">
         <img v-for="item in imgList" :src="'http://122.112.212.35:8092' + item.photoPath" :key="item.id" alt="">
       </el-dialog>
@@ -679,4 +772,17 @@ export default {
     line-height: 48px;
     font-size: 24px;
   }
+  .case {
+    width: 910px;
+    border: 1px solid #ddd;
+  }
+  .case-bottom {
+    border-bottom: 1px solid #ddd;
+    padding: 10px 0;
+    text-align: center;
+    font-size: 18px;
+  }
+  .leftBorder {
+    border-left: 1px solid #ddd;
+  }
 </style>