xiongwanxiong vor 1 Woche
Ursprung
Commit
6c434f0b67

+ 2 - 0
wxjy-wxjy-service/src/main/resources/vm/vue/index.vue.vm

@@ -118,6 +118,7 @@
     </cacp-complex-table>
   </cacp-search-layout>
 
+  <!--新增、编辑弹框-->
   <cacp-dialog
       v-model="state.dialogVisible"
       :resizable="false"
@@ -271,6 +272,7 @@
     </template>
   </cacp-dialog>
 
+  <!--查看弹框-->
   <cacp-dialog
       v-model="state.viewDialogVisible"
       :resizable="false"

+ 349 - 4
wxjy-wxjy-web/src/views/analyze/NewDeclaredGoods.vue

@@ -171,6 +171,7 @@
     </cacp-complex-table>
   </cacp-search-layout>
 
+  <!--新增、编辑弹框-->
   <cacp-dialog
     v-model="state.dialogVisible"
     :resizable="false"
@@ -637,7 +638,352 @@
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </template>
   </cacp-dialog>
+  <!--查看弹框-->
+  <cacp-dialog
+    v-model="state.viewDialogVisible"
+    :resizable="false"
+    :title="state.viewTitle"
+    width="70%"
+    @closed="onDialogClosed"
+  >
+    <el-form
+      :model="state.viewForm"
+      ref="dialogFormRef"
+      label-width="auto"
+      label-position="left"
+      style="max-height: 60vh; overflow-y: auto; padding-right: 10px;"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="报关单号" prop="entryId">
+            {{state.viewForm.entryId}}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="商品序号" prop="gno">
+            {{state.viewForm.gno}}
+          </el-form-item>
+        </el-col>
+      </el-row><el-row :gutter="20">
+
+      <el-col :span="12">
+        <el-form-item label="进出境口岸" prop="iePort">
+          {{findOptionLabel(state.viewForm.iePort,portCodeList)}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="主管海关" prop="customsCode">
+          <dict-tag :options="dict.customs_code" :dict-value="state.viewForm.customsCode" />
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="出入境标志" prop="ieFlag">
+          <dict-tag :options="dict.ie_flag" :dict-value="state.viewForm.ieFlag" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="申报时间" prop="declDate">
+          {{ dayjs(state.viewForm.declDate).format('YYYY-MM-DD HH:mm:ss') }}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="进口经营/出口生产企业代码" prop="consignScc">-->
+      <!--          <el-input v-model="state.formData.consignScc" placeholder="请输入进口经营/出口生产企业代码" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <el-col :span="12">
+        <el-form-item label="进口经营/出口生产企业代码" prop="consignCode">
+          {{state.viewForm.consignCode}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="进口经营/出口生产企业名称" prop="consignName">
+          {{state.viewForm.consignName}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="HS编号" prop="codeTs">
+          {{state.viewForm.codeTs}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="CIQ编码" prop="iqCode">
+          {{state.viewForm.iqCode}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="商品名称" prop="gname">
+          {{state.viewForm.gname}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="规格型号" prop="gmodel">
+          {{state.viewForm.gmodel}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="报检名称" prop="iqGName">
+          {{state.viewForm.iqGName}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="商品英文名称" prop="gNameFn">
+          {{state.viewForm.gNameFn}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="检验检疫货物规格" prop="iqGModel">
+          {{state.viewForm.iqGModel}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="产品有效期" prop="prodValidaty">
+          {{state.viewForm.prodValidaty}}
+        </el-form-item>
+      </el-col>
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="成份/原料/组分" prop="gComposition">-->
+      <!--          <el-input v-model="state.formData.gComposition" placeholder="请输入成份/原料/组分" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="产品保质期" prop="prodWarranty">-->
+      <!--          <el-input v-model="state.formData.prodWarranty" placeholder="请输入产品保质期" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
 
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">
+              <el-form-item label="征免方式" prop="dutyMode">
+                <el-input v-model="state.formData.dutyMode" placeholder="请输入征免方式" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="条形码" prop="GTIN">
+                <el-input v-model="state.formData.GTIN" placeholder="请输入条形码" />
+              </el-form-item>
+            </el-col>-->
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="申报数量" prop="gQty">
+          {{state.viewForm.gQty}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="申报计量单位" prop="gUnit">
+          {{findOptionLabel(state.viewForm.gUnit,unitsCodeList)}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="法定第一数量" prop="qty1">
+          {{state.viewForm.qty1}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="法定第一计量单位" prop="unit1">
+          {{findOptionLabel(state.viewForm.unit1,unitsCodeList)}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="第二数量" prop="qty2">
+          {{state.viewForm.qty2}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="第二计量单位" prop="unit2">
+          {{findOptionLabel(state.viewForm.unit2,unitsCodeList)}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="申报单价" prop="declPrice">
+          {{state.viewForm.declPrice}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="申报总价" prop="declTotal">
+          {{state.viewForm.declTotal}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="成交币制" prop="tradeCurr">-->
+      <!--          <el-input v-model="state.formData.tradeCurr" placeholder="请输入成交币制" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="成交总价" prop="tradeTotal">-->
+      <!--          <el-input v-model="state.formData.tradeTotal" placeholder="请输入成交总价" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="完税价格" prop="dutyValue">-->
+      <!--          <el-input v-model="state.formData.dutyValue" placeholder="请输入完税价格" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <el-col :span="12">
+        <el-form-item label="统计人民币价" prop="rmbPrice">
+          {{state.viewForm.rmbPrice}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="统计美元价" prop="usdPrice">
+          {{state.viewForm.usdPrice}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="成交汇率" prop="exchangeRate">-->
+      <!--          <el-input v-model="state.formData.exchangeRate" placeholder="请输入成交汇率" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="原产国" prop="originCountry">
+          {{findOptionLabel(state.viewForm.originCountry,countryCodeList)}}
+        </el-form-item>
+      </el-col>
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="原产地区代码" prop="originRegionCode">-->
+      <!--          <el-input v-model="state.formData.originRegionCode" placeholder="请输入原产地区代码" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <el-col :span="12">
+        <el-form-item label="最终目的国" prop="destCountry">
+          {{findOptionLabel(state.viewForm.destCountry,countryCodeList)}}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="境内目的地/境内货源地" prop="ieDistrictCode">-->
+      <!--          <el-input v-model="state.formData.ieDistrictCode" placeholder="请输入境内目的地/境内货源地" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="目的地/货源地" prop="iqIeDistrictCode">
+          {{findOptionLabel(state.viewForm.iqIeDistrictCode,countryCodeList)}}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="境外生产企业名称" prop="frnProducerName">
+          {{ state.viewForm.frnProducerName }}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="生产日期" prop="productDate">
+          {{state.viewForm.productDate}}
+<!--          {{ dayjs(state.viewForm.productDate).format('YYYY-MM-DD HH:mm:ss') }}-->
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="生产批次" prop="productBatch">
+          {{ state.viewForm.productBatch }}
+        </el-form-item>
+      </el-col>
+
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="UN编码" prop="ungid">
+          {{ state.viewForm.ungid }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="货物型号" prop="productModel">
+          {{ state.viewForm.productModel }}
+        </el-form-item>
+      </el-col>
+
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="货物品牌" prop="productBrand">
+          {{ state.viewForm.productBrand }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="非危险化学品" prop="ungFlag">
+          <dict-tag :options="dict.yes_no" :dict-value="state.viewForm.ungFlag" />
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="危包规格" prop="ungModel">
+          {{ state.viewForm.ungModel }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="危包类别" prop="ungClassify">
+          {{ state.viewForm.ungClassify }}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <el-col :span="12">
+        <el-form-item label="危险货物名称" prop="ungGName">
+          {{ state.viewForm.ungGName }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="货物属性" prop="productCharCode">
+          {{ state.viewForm.productCharCode }}
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="货号" prop="goodsId">-->
+      <!--          <el-input v-model="state.formData.goodsId" placeholder="请输入货号" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="用途代码" prop="useTo">-->
+      <!--          <el-input v-model="state.formData.useTo" placeholder="请输入用途代码" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="每项商品需要监管证件" prop="gCertFlag">-->
+      <!--          <el-input v-model="state.formData.gCertFlag" placeholder="请输入每项商品需要监管证件" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="生产单位注册号" prop="mnufctrRegno">-->
+      <!--          <el-input v-model="state.formData.mnufctrRegno" placeholder="请输入生产单位注册号" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+    </el-row><el-row :gutter="20">
+      <!--      <el-col :span="12">-->
+      <!--        <el-form-item label="创建时间" prop="createTime">-->
+      <!--          <el-input v-model="state.formData.createTime" placeholder="请输入创建时间" />-->
+      <!--        </el-form-item>-->
+      <!--      </el-col>-->
+      <el-col :span="12">
+        <el-form-item label="CAS号" prop="cas">
+          {{ state.viewForm.cas }}
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="危险品类型" prop="goodsType">
+          <dict-tag :options="dict.goods_type" :whole-match="true" :dict-value="state.viewForm.goodsType" />
+        </el-form-item>
+      </el-col>
+    </el-row><el-row :gutter="20">
+
+    </el-row>
+    </el-form>
+  </cacp-dialog>
 </template>
 
 <script lang="ts" setup>
@@ -1037,10 +1383,9 @@ function onRefresh() {
 
 // 查看
 function onView(row: NewDeclaredGoods) {
-  state.formData = { ...row }
-  state.dialogVisible = true
-  state.isEdit = false
-  state.title = '查看新申报商品提示详情'
+  state.viewForm = { ...row }
+  state.viewDialogVisible = true
+  state.viewTitle = '查看新申报商品提示详情'
 }
 
 // 编辑