2 Revize 7432440f33 ... 66b4b8d1f4

Autor SHA1 Zpráva Datum
  buzhi 66b4b8d1f4 Merge branch 'master' of http://101.36.160.140:21044/delivery-warehouse-java/delivery-depot-vue před 1 rokem
  buzhi a67738d46e 视频联调 před 1 rokem
1 změnil soubory, kde provedl 86 přidání a 27 odebrání
  1. 86 27
      src/views/VisualDisplay/src/pages/cf/index.vue

+ 86 - 27
src/views/VisualDisplay/src/pages/cf/index.vue

@@ -289,7 +289,7 @@
289 289
                     </el-table-column>
290 290
                     <el-table-column prop="fileIds" label="附件个数" width="160" align="center">
291 291
                       <template #default="scope">
292
-                        <span class="fjBtn" @click="openFiles(scope.row.fileList)">{{
292
+                        <span class="fjBtn" @click="openFiles(scope.row)">{{
293 293
                           scope.row.fileIds
294 294
                         }}</span>
295 295
                       </template>
@@ -421,11 +421,11 @@
421 421
                       <div class="image_preview">
422 422
                         <el-image
423 423
                           style="width: 100%; height: 100%"
424
-                          :src="item.slice(1, item.length)"
424
+                          :src="item"
425 425
                           :zoom-rate="1.2"
426 426
                           :max-scale="7"
427 427
                           :min-scale="0.2"
428
-                          :preview-src-list="[item.slice(1, item.length)]"
428
+                          :preview-src-list="[item]"
429 429
                           show-progress
430 430
                           fit="contain"
431 431
                         />
@@ -503,29 +503,85 @@
503 503
       <el-dialog title="" v-model="Dialogfiles" width="1050px" top="15vh">
504 504
         <template #header="{}">
505 505
           <div class="dialog_title">
506
-            <span class="dialog_title_text">附件列表</span>
506
+            <span class="dialog_title_text">{{ searchform.crklx == 0 ? '出库' : '入库' }}单</span>
507 507
           </div>
508 508
         </template>
509
-        <el-scrollbar style="height: 600px">
510
-          <el-row style="height: 600px;padding:15px">
511
-            <el-col :span="12" v-for="(item, index) in fileList" :key="index">
512
-              <!-- <img :src="item" alt="附件图片"/>
513
-             -->
514
-              <div class="image_preview">
515
-                <el-image
516
-                  style="width: 100%; height: 100%"
517
-                  :src="item"
518
-                  :zoom-rate="1.2"
519
-                  :max-scale="7"
520
-                  :min-scale="0.2"
521
-                  :preview-src-list="[item]"
522
-                  show-progress
523
-                  fit="contain"
524
-                />
525
-              </div>
526
-            </el-col>
527
-            <!-- <el-col :span="12">图片</el-col> -->
528
-          </el-row>
509
+        <el-scrollbar class="hw-rightcon" style="height: 600px; margin: 0">
510
+          <el-form
511
+            class="formstyletwo"
512
+            style="height: 600px; padding: 15px"
513
+            ref="form"
514
+            :model="crkDetail"
515
+            label-width="140px"
516
+          >
517
+            <h3 class="hwk_title"><i></i>基础信息</h3>
518
+            <el-row :gutter="20">
519
+              <el-col :span="8">
520
+                <el-form-item label="粮食品种">
521
+                  <el-input v-model="crkDetail.lspzmc" />
522
+                </el-form-item>
523
+              </el-col>
524
+              <el-col :span="8">
525
+                <el-form-item label="粮食等级">
526
+                  <el-input v-model="crkDetail.lsdjmc" />
527
+                </el-form-item>
528
+              </el-col>
529
+              <el-col :span="8">
530
+                <el-form-item label="净重(吨)">
531
+                  <el-input v-model="crkDetail.jz" />
532
+                </el-form-item>
533
+              </el-col>
534
+            </el-row>
535
+            <h3 class="hwk_title"><i></i>承运及登记</h3>
536
+            <el-row :gutter="20">
537
+              <el-col :span="8">
538
+                <el-form-item label="承运人">
539
+                  <el-input v-model="crkDetail.cyr" />
540
+                </el-form-item>
541
+              </el-col>
542
+              <el-col :span="8">
543
+                <el-form-item label="运输工具">
544
+                  <el-input v-model="crkDetail.ysgj" />
545
+                </el-form-item>
546
+              </el-col>
547
+              <el-col :span="8">
548
+                <el-form-item label="车船号">
549
+                  <el-input v-model="crkDetail.cch" />
550
+                </el-form-item>
551
+              </el-col>
552
+              <el-col :span="8">
553
+                <el-form-item label="入门时间">
554
+                  <el-input v-model="crkDetail.rmsj" />
555
+                </el-form-item>
556
+              </el-col>
557
+              <el-col :span="8">
558
+                <el-form-item label="登记员">
559
+                  <el-input v-model="crkDetail.djy" />
560
+                </el-form-item>
561
+              </el-col>
562
+              <el-col :span="8">
563
+                <el-form-item label="出门时间">
564
+                  <el-input v-model="crkDetail.cmsj" />
565
+                </el-form-item>
566
+              </el-col>
567
+            </el-row>
568
+            <el-row :gutter="30">
569
+              <el-col :span="8" v-for="(item, index) in fileList" :key="index">
570
+                <div class="image_preview">
571
+                  <el-image
572
+                    style="width: 100%; height: 100%"
573
+                    :src="item"
574
+                    :zoom-rate="1.2"
575
+                    :max-scale="7"
576
+                    :min-scale="0.2"
577
+                    :preview-src-list="[item]"
578
+                    show-progress
579
+                    fit="contain"
580
+                  />
581
+                </div>
582
+              </el-col>
583
+            </el-row>
584
+          </el-form>
529 585
         </el-scrollbar>
530 586
       </el-dialog>
531 587
     </div>
@@ -621,6 +677,7 @@ const cangOptions = ref([
621 677
   //   hwmc: 'HW-2'
622 678
   // }
623 679
 ])
680
+const crkDetail = ref({})
624 681
 const fileList = ref([])
625 682
 //出入库
626 683
 const page = ref({
@@ -801,7 +858,8 @@ const tableRowClassName = ({ row, rowIndex }) => {
801 858
 //文件弹窗
802 859
 const openFiles = (row: any) => {
803 860
   Dialogfiles.value = true
804
-  fileList.value = row
861
+  crkDetail.value = row
862
+  fileList.value = row.fileList
805 863
 }
806 864
 // 获取行政区划代码
807 865
 const getXzqh = async () => {
@@ -1197,6 +1255,7 @@ onMounted(() => {
1197 1255
     font-size: 20px;
1198 1256
     font-weight: bold;
1199 1257
     margin: 10px 0px 20px;
1258
+    color: #ffffff;
1200 1259
     i {
1201 1260
       float: left;
1202 1261
       width: 5px;
@@ -1444,10 +1503,10 @@ onMounted(() => {
1444 1503
   //   width: 100%;
1445 1504
   //   height: 100px;
1446 1505
   // }
1447
-  .el-image{
1506
+  .el-image {
1448 1507
     position: relative;
1449 1508
   }
1450
-  .el-image__error{
1509
+  .el-image__error {
1451 1510
     width: 80%;
1452 1511
     height: 80%;
1453 1512
     position: absolute;