改动

src/views/DeliveryWarehouse/ComprehensiveQuery/index.vue

@@ -72,14 +72,6 @@ const cfztOption = ref<CfOption[]>([
     value: '4',
     label: '贷款人选定'
   },
-  {
-    value: '5',
-    label: '粮食入库'
-  },
-  {
-    value: '6',
-    label: '粮食出清'
-  }
 ])
 
 // 组件状态
@@ -135,38 +127,38 @@ const listCopy = ref<TableItem[]>([
     dwmc: '辽宁直属公司',
     kqmc: '辽宁直属库',
     kqfzr: '张民',
-    cfsl: '1',
+    cfsl: '3',
     cfzcr: '23',
     zzc: '400',
     sndjlr: '300',
     cfzt: '贷款人选定'
   },
-  {
-    sheng: '四川省',
-    shi: '广安市',
-    xian: '华蓥市',
-    dwmc: '四川华蓥铜堡省粮食储备库',
-    kqmc: '四川华蓥铜堡省粮食储备库高兴主库',
-    kqfzr: '成云松',
-    cfsl: '1',
-    cfzcr: '23',
-    zzc: '400',
-    sndjlr: '300',
-    cfzt: '粮食入库'
-  },
-  {
-    sheng: '陕西省',
-    shi: '咸阳市',
-    xian: '秦都区',
-    dwmc: '咸阳秦储粮粮油仓储有限公司',
-    kqmc: '咸阳秦储粮粮油仓储有限公司',
-    kqfzr: '余涛',
-    cfsl: '1',
-    cfzcr: '23',
-    zzc: '400',
-    sndjlr: '300',
-    cfzt: '粮食出清'
-  }
+  // {
+  //   sheng: '四川省',
+  //   shi: '广安市',
+  //   xian: '华蓥市',
+  //   dwmc: '四川华蓥铜堡省粮食储备库',
+  //   kqmc: '四川华蓥铜堡省粮食储备库高兴主库',
+  //   kqfzr: '成云松',
+  //   cfsl: '1',
+  //   cfzcr: '23',
+  //   zzc: '400',
+  //   sndjlr: '300',
+  //   cfzt: '粮食入库'
+  // },
+  // {
+  //   sheng: '陕西省',
+  //   shi: '咸阳市',
+  //   xian: '秦都区',
+  //   dwmc: '咸阳秦储粮粮油仓储有限公司',
+  //   kqmc: '咸阳秦储粮粮油仓储有限公司',
+  //   kqfzr: '余涛',
+  //   cfsl: '1',
+  //   cfzcr: '23',
+  //   zzc: '400',
+  //   sndjlr: '300',
+  //   cfzt: '粮食出清'
+  // }
 ])
 const list = ref<TableItem[]>([])
 const total = ref(0)
@@ -277,12 +269,6 @@ const openCwxxForm = (row: any) => {
     case '贷款人选定':
       type = '3'
       break
-    case '粮食入库':
-      type = '4'
-      break
-    case '粮食出清':
-      type = '5'
-      break
   }
   refComprehensiveQueryForm.value.open(type, row)
 }
@@ -448,7 +434,7 @@ const yanshi = ref(false)
         min-width="180"
         prop="sndjlr"
       />
-      <el-table-column align="center" label="选定状态" min-width="150" prop="xdzt" />
+      <!-- <el-table-column align="center" label="选定状态" min-width="150" prop="xdzt" /> -->
       <el-table-column align="center" label="仓房状态" min-width="120" prop="cfzt" />
     </el-table>
 

src/views/DeliveryWarehouse/compontents/ComprehensiveQueryForm.vue

@@ -58,24 +58,24 @@
         />
         <el-table-column
           align="center"
-          v-if="typeflag == '4'"
-          label="入库净重（吨）"
+          v-if="typeflag == '3'"
+          label="入库数量（吨）"
           min-width="140"
-          prop="rkjz"
+          prop="rksl"
         />
         <el-table-column
           align="center"
-          v-if="typeflag == '5'"
-          label="出库净重（吨）"
+          v-if="typeflag == '3'"
+          label="出库数量（吨）"
           min-width="140"
-          prop="ckjz"
+          prop="cksl"
         />
         <el-table-column
           align="center"
-          v-if="typeflag == '5'"
-          label="损溢（吨）"
+          v-if="typeflag == '3'"
+          label="存粮状态"
           min-width="140"
-          prop="sy"
+          prop="clzt"
         />
         <el-table-column
           align="center"
@@ -86,8 +86,8 @@
           prop=""
         >
           <template #default="">
-            <el-button  type="primary" size="small">通过</el-button>
-            <el-button  type="danger" size="small">退回</el-button>
+            <el-button type="primary" size="small">通过</el-button>
+            <el-button type="danger" size="small">退回</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -118,9 +118,9 @@ interface TableItem {
   hyjg: string // 核验结果
   xdr: string // 选定人/单位
   lxfs: string // 联系方式
-  rkjz: string // 入库净重（吨）
-  ckjz: string // 出库净重（吨）
-  sy: string // 损溢（吨）
+  rksl: string // 入库数量（吨）
+  cksl: string // 出库数量（吨）
+  clzt: string // 存粮状态
 
   cfzt: string // 仓房状态
 }
@@ -149,9 +149,9 @@ const listCopy = ref<TableItem[]>([
     hyjg: '核验通过',
     xdr: '任杰',
     lxfs: '18281775868',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '已入库',
 
     cfzt: '国家备选'
   },
@@ -168,9 +168,9 @@ const listCopy = ref<TableItem[]>([
     hyjg: '核验通过',
     xdr: '岳刚民',
     lxfs: '13891093338',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '出库中',
 
     cfzt: '省级备选'
   },
@@ -187,9 +187,9 @@ const listCopy = ref<TableItem[]>([
     hyjg: '核验通过',
     xdr: '李志宏',
     lxfs: '15663918888',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '已出清',
 
     cfzt: '银行认定'
   },
@@ -206,49 +206,49 @@ const listCopy = ref<TableItem[]>([
     hyjg: '核验通过',
     xdr: '向远清',
     lxfs: '18160131721',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '已入库',
 
     cfzt: '贷款人选定'
   },
   {
-    sheng: '四川省',
-    shi: '广安市',
-    xian: '华蓥市',
-    dwmc: '四川华蓥铜堡省粮食储备库',
-    kqmc: '四川华蓥铜堡省粮食储备库高兴主库',
-    cfmc: '3号仓',
-    sjcr: 400,
+    sheng: '辽宁省',
+    shi: '沈阳市',
+    xian: '铁西区',
+    dwmc: '辽宁直属公司',
+    kqmc: '辽宁直属库',
+    cfmc: '5号仓',
+    sjcr: 500,
     rdyh: '工商银行',
     hyr: '张小军',
     hyjg: '核验通过',
     xdr: '张延波',
     lxfs: '13945800010',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '出库中',
 
-    cfzt: '粮食入库'
+    cfzt: '贷款人选定'
   },
   {
-    sheng: '陕西省',
-    shi: '咸阳市',
-    xian: '秦都区',
-    dwmc: '咸阳秦储粮粮油仓储有限公司',
-    kqmc: '咸阳秦储粮粮油仓储有限公司',
-    cfmc: '3号仓',
+    sheng: '辽宁省',
+    shi: '沈阳市',
+    xian: '铁西区',
+    dwmc: '辽宁直属公司',
+    kqmc: '辽宁直属库',
+    cfmc: '5号仓',
     sjcr: 400,
     rdyh: '工商银行',
     hyr: '吕辉',
     hyjg: '核验通过',
     xdr: '陈少华',
     lxfs: '13946470333',
-    rkjz: '100',
-    ckjz: '100',
-    sy: '5',
+    rksl: '100',
+    cksl: '100',
+    clzt: '已出清',
 
-    cfzt: '粮食出清'
+    cfzt: '贷款人选定'
   }
 ])
 const list = ref<TableItem[]>([])

src/views/VisualDisplay/src/pages/compontent/Map2.vue

@@ -364,7 +364,7 @@ const initEcharts = (geoJson, name, chart) => {
       // console.log(xzqhdm, 'xzqhdm-========')
 
       let clickCode = allCode.value.filter((areaJson) => areaJson.name === param.name)[0].adcode
-      // getTotalData(clickCode)
+      getTotalData(clickCode)
     } else {
       // console.log(param, 'param-====')
     }