Merge remote-tracking branch 'origin/master'

snowy-admin-web/src/views/yqyc/general-ledger/one/goods.vue

@@ -1,313 +1,361 @@
 <template>
 	<a-modal
-      v-model:open="open"
-      :title="(formData?.warehouseType == 0 ? '入' : '出') + '库单'"
-      centered
-      width="90%"
-  >
-      <div class="goods-detail">
-        <a-card>
-          <a-form ref="formRef" :model="formData">
-            <a-row :gutter="16">
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库单预录入编号'" name="reWarehouseNumber">
-                  <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库单编号'" name="warehouseNumber">
-                  <a-input v-model:value="formData.warehouseNumber" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="径予声明编号" name="statementCode">
-                  <a-input v-model:value="formData.statementCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="核注清单号" name="hzCode">
-                  <a-input v-model:value="formData.hzCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="企业编码" name="companyCode">
-                  <a-input v-model:value="formData.companyCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="企业名称" name="companyName">
-                  <a-input v-model:value="formData.companyName" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="采购类型" name="purchaseType">
-                  <a-input v-model:value="formData.purchaseType" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="监管方式" name="regulaMethod">
-                  <a-input v-model:value="formData.regulaMethod" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="币制" name="bz">
-					<a-select v-model:value="formData.currency" :disabled="isView" placeholder="请选择币制" :options="currencyOptions" show-search allow-clear option-filter-prop="label" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="启抵国(地区)" name="qdgDq">
-                  <a-input v-model:value="formData.qdgDq" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库日期'" name="warehouseTime">
-                  <a-input v-model:value="formData.warehouseTime" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="进/出口岸" name="inport">
-                  <a-input v-model:value="formData.inport" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="进/出境关别" name="jjgb">
-                  <a-input v-model:value="formData.jjgb" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="主管关区代码" name="zggqdm">
-                  <a-input v-model:value="formData.zggqdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="报关标志" name="bgbz">
-                  <a-input v-model:value="formData.bgbz" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="运输方式" name="ysfs">
-                  <a-input v-model:value="formData.ysfs" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="区港联动标记" name="qgldbj">
-                  <a-input v-model:value="formData.qgldbj" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="是否为报税商品" name="bssp">
-                  <a-input v-model:value="formData.bssp" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="一线报关单号" name="yxbgdh">
-                  <a-input v-model:value="formData.yxbgdh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '发' :'收') + '货企业编号'" name="fhqybh">
-                  <a-input v-model:value="formData.fhqybh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '发' :'收') + '货企业名称'" name="fhqymc">
-                  <a-input v-model:value="formData.fhqymc" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="24">
-                <a-form-item label="备注" name="remark">
-                  <a-textarea v-model:value="formData.remark" :disabled="true" :rows="4"/>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-form>
-        </a-card>
-        <a-card style="margin-top: 10px;">
-          <a-form ref="formRef" :model="formData">
-            <a-row :gutter="16">
-              <a-col :span="8">
-                <a-form-item label="物料编号" name="wlbh">
-                  <a-input v-model:value="formData.wlbh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="物料名称" name="wlmc">
-                  <a-input v-model:value="formData.wlmc" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="版本号" name="version">
-                  <a-input v-model:value="formData.version" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="核注清单项次号" name="hzqdxch">
-                  <a-input v-model:value="formData.hzqdxch" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="金二账册号" name="jezce">
-                  <a-input v-model:value="formData.jezce" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="备案序号" name="recordNum">
-                  <a-input v-model:value="formData.recordNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="备案名称" name="recordName">
-                  <a-input v-model:value="formData.recordName" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="料件成品标志" name="fjcpbz">
-                  <a-input v-model:value="formData.fjcpbz" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="规格型号" name="ggxh">
-                  <a-input v-model:value="formData.ggxh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <template v-if="formData?.warehouseType == 0">
-                <a-col :span="8">
-                  <a-form-item label="品牌类型" name="brandType">
-                    <a-input v-model:value="formData.brandType" :disabled="true"/>
-                  </a-form-item>
-                </a-col>
-              </template>
-              <a-col :span="8">
-                <a-form-item label="原产国(地区)" name="ycgdq">
-                  <a-input v-model:value="formData.ycgdq" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <template v-if="formData?.warehouseType == 0">
-                <a-col :span="8">
-                  <a-form-item label="最终目的国(地图)" name="zzmdg">
-                    <a-input v-model:value="formData.zzmdg" :disabled="true"/>
-                  </a-form-item>
-                </a-col>
-              </template>
-              <a-col :span="8">
-                <a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库数量'" name="rkNum">
-                  <a-input v-model:value="formData.rkNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="计量单位" name="measurementUnit">
-                  <a-input v-model:value="formData.measurementUnit" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="单价" name="unitPrice">
-                  <a-input v-model:value="formData.unitPrice" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="第一法定数量" name="fyfdNum">
-                  <a-input v-model:value="formData.fyfdNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="第二法定数量" name="defdNum">
-                  <a-input v-model:value="formData.defdNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="征免方式" name="zmfs">
-                  <a-input v-model:value="formData.zmfs" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="货仓代码" name="hcdm">
-                  <a-input v-model:value="formData.hcdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="仓位代码" name="cwdm">
-                  <a-input v-model:value="formData.cwdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <template v-if="formData?.warehouseType == 1">
-                <a-col :span="8">
-                  <a-form-item label="货物来源单证类型" name="hwlyTpe">
-                    <a-input v-model:value="formData.hwlyTpe" :disabled="true"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :span="8">
-                  <a-form-item label="货物来源单证编号" name="hwlyCode">
-                    <a-input v-model:value="formData.hwlyCode" :disabled="true"/>
-                  </a-form-item>
-                </a-col>
-              </template>
-            </a-row>
-          </a-form>
-          <a-table
-            style="margin-top: 10px"
-            bordered
-            :dataSource="[formData]"
-            :columns="[
-              {title: '物料编号',dataIndex: 'wlbh',key: 'wlbh'},
-              {title: '物料名称',dataIndex: 'wlmc',key: 'wlmc'},
-              {title: '规格型号',dataIndex: 'ggxh',key: 'ggxh'},
-              {title: (formData?.warehouseType == 0 ? '入' :'出') + '库数量',dataIndex: 'rkNum',key: 'rkNum'},
-              {title: '计量单位',dataIndex: 'measurementUnit',key: 'measurementUnit'},
-              {title: '操作',dataIndex: 'action',key: 'action'},
-            ]"
-            :pagination="false"
-          >
-            <template #bodyCell="{ column, record }">
-              <template v-if="column.dataIndex === 'action'">
-                <a-button type="link" primary size="small">查看</a-button>
-              </template>
-            </template>
-          </a-table>
-        </a-card>
-      </div>
-      <template #footer></template>
+		v-model:open="open"
+		:title="(formData?.warehouseType == 0 ? '入' : '出') + '库单'"
+		centered
+		width="90%"
+	>
+		<div class="goods-detail">
+			<a-card>
+				<a-form ref="formRef" :model="formData">
+					<a-row :gutter="16">
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库单预录入编号'"
+										 name="reWarehouseNumber">
+								<a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库单编号'"
+										 name="warehouseNumber">
+								<a-input v-model:value="formData.warehouseNumber" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="径予声明编号" name="statementCode">
+								<a-input v-model:value="formData.statementCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="核注清单号" name="hzCode">
+								<a-input v-model:value="formData.hzCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="企业编码" name="companyCode">
+								<a-input v-model:value="formData.companyCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="企业名称" name="companyName">
+								<a-input v-model:value="formData.companyName" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="采购类型" name="purchaseType">
+								<a-input v-model:value="formData.purchaseType" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="监管方式" name="regulaMethod">
+								<a-input v-model:value="formData.regulaMethod" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="币制" name="bz">
+<!--								<a-select v-model:value="formData.currency" :disabled="true" placeholder="请选择币制"-->
+<!--										  :options="currencyOptions" show-search allow-clear-->
+<!--										  option-filter-prop="label"/>-->
+								<a-input v-model:value="formData.currency" :disabled="true" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="起抵国(地区)" name="qdgDq">
+								<a-input v-model:value="formData.qdgDq" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库日期'"
+										 name="warehouseTime">
+								<a-input v-model:value="formData.warehouseTime" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="进/出口岸" name="inport">
+								<a-input v-model:value="formData.inport" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="进/出境关别" name="jjgb">
+								<a-input v-model:value="formData.jjgb" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="主管关区代码" name="zggqdm">
+								<a-input v-model:value="formData.zggqdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="报关标志" name="bgbz">
+								<a-input v-model:value="formData.bgbz" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="运输方式" name="ysfs">
+								<a-input v-model:value="formData.ysfs" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="区港联动联动标记" name="qgldbj">
+								<a-input v-model:value="formData.qgldbj" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="是否为保税商品" name="bssp">
+								<a-input v-model:value="formData.bssp" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="一线报关单号" name="yxbgdh">
+								<a-input v-model:value="formData.yxbgdh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '发' :'收') + '货企业编号'"
+										 name="fhqybh">
+								<a-input v-model:value="formData.fhqybh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '发' :'收') + '货企业名称'"
+										 name="fhqymc">
+								<a-input v-model:value="formData.fhqymc" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="备注" name="remark">
+								<a-textarea v-model:value="formData.remark" :disabled="true" :rows="4"/>
+							</a-form-item>
+						</a-col>
+					</a-row>
+				</a-form>
+			</a-card>
+			<a-card style="margin-top: 10px;">
+				<a-form ref="formRef" :model="formData">
+					<a-row :gutter="16">
+						<a-col :span="8">
+							<a-form-item label="物料编号" name="wlbh">
+								<a-input v-model:value="formData.wlbh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="物料名称" name="wlmc">
+								<a-input v-model:value="formData.wlmc" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="版本号" name="version">
+								<a-input v-model:value="formData.version" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="核注清单项次号" name="hzqdxch">
+								<a-input v-model:value="formData.hzqdxch" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="金二账册号" name="jezce">
+								<a-input v-model:value="formData.jezce" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="备案序号" name="recordNum">
+								<a-input v-model:value="formData.recordNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="备案名称" name="recordName">
+								<a-input v-model:value="formData.recordName" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="料件成品标志" name="fjcpbz">
+								<a-input v-model:value="formData.fjcpbz" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="规格型号" name="ggxh">
+								<a-input v-model:value="formData.ggxh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<template v-if="formData?.warehouseType == 0">
+							<a-col :span="8">
+								<a-form-item label="品牌类型" name="brandType">
+									<a-input v-model:value="formData.brandType" :disabled="true"/>
+								</a-form-item>
+							</a-col>
+						</template>
+						<a-col :span="8">
+							<a-form-item label="原产国(地区)" name="ycgdq">
+								<a-input v-model:value="formData.ycgdq" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<template v-if="formData?.warehouseType == 0">
+							<a-col :span="8">
+								<a-form-item label="最终目的国(地图)" name="zzmdg">
+									<a-input v-model:value="formData.zzmdg" :disabled="true"/>
+								</a-form-item>
+							</a-col>
+						</template>
+						<a-col :span="8">
+							<a-form-item :label="(formData?.warehouseType == 0 ? '入' :'出') + '库数量'" name="rkNum">
+								<a-input v-model:value="formData.rkNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="计量单位" name="measurementUnit">
+								<a-input v-model:value="formData.measurementUnit" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="单价" name="unitPrice">
+								<a-input v-model:value="formData.unitPrice" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="第一法定数量" name="fyfdNum">
+								<a-input v-model:value="formData.fyfdNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="第二法定数量" name="defdNum">
+								<a-input v-model:value="formData.defdNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="征免方式" name="zmfs">
+								<a-input v-model:value="formData.zmfs" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货仓代码" name="hcdm">
+								<a-input v-model:value="formData.hcdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="仓位代码" name="cwdm">
+								<a-input v-model:value="formData.cwdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<template v-if="formData?.warehouseType == 1">
+							<a-col :span="8">
+								<a-form-item label="货物来源单证类型" name="hwlyTpe">
+									<a-input v-model:value="formData.hwlyTpe" :disabled="true"/>
+								</a-form-item>
+							</a-col>
+							<a-col :span="8">
+								<a-form-item label="货物来源单证编号" name="hwlyCode">
+									<a-input v-model:value="formData.hwlyCode" :disabled="true"/>
+								</a-form-item>
+							</a-col>
+						</template>
+					</a-row>
+				</a-form>
+				<a-table
+					style="margin-top: 10px"
+					bordered
+					:dataSource="[formData]"
+					:columns="[
+					  {title: '物料编号',dataIndex: 'wlbh',key: 'wlbh'},
+					  {title: '物料名称',dataIndex: 'wlmc',key: 'wlmc'},
+					  {title: '规格型号',dataIndex: 'ggxh',key: 'ggxh'},
+					  {title: (formData?.warehouseType == 0 ? '入' :'出') + '库数量',dataIndex: 'rkNum',key: 'rkNum'},
+					  {title: '计量单位',dataIndex: 'measurementUnit',key: 'measurementUnit'},
+					  {title: '操作',dataIndex: 'action',key: 'action'},
+					]"
+					:pagination="false"
+				>
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'action'">
+							<a-button type="link" primary size="small">查看</a-button>
+						</template>
+					</template>
+				</a-table>
+			</a-card>
+		</div>
+		<template #footer></template>
 	</a-modal>
 </template>
 
 <script setup name="enterpriseDetail">
-	import tool from '@/utils/tool'
-	import { cloneDeep } from 'lodash-es'
-  import qyInWarehouseApi from "@/api/yqyc/qyInWarehouseApi";
-	// 抽屉状态
-	const open = ref(false)
-	const emit = defineEmits({ successful: null })
-	const formRef = ref()
-	// 表单数据
-	const formData = ref({})
-	const currencyOptions = ref([])
+import tool from '@/utils/tool'
+import {cloneDeep} from 'lodash-es'
+import qyInWarehouseApi from "@/api/yqyc/qyInWarehouseApi";
+// 抽屉状态
+const open = ref(false)
+const emit = defineEmits({successful: null})
+const formRef = ref()
+// 表单数据
+const formData = ref({})
+const currencyOptions = ref([])
 
-	// 打开抽屉
-	const onOpen = (record, view = false) => {
-		open.value = true
-		if (record) {
-      qyInWarehouseApi.qyInWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
-        formData.value = Object.assign({
-          warehouseType: record.warehouseType
-        }, res)
-      })
-		}
-		currencyOptions.value = tool.dictList('hbdm')
-
-	}
-	// 关闭抽屉
-	const onClose = () => {
-		formRef.value?.resetFields()
-		formData.value = {}
-		open.value = false
+// 打开抽屉
+const onOpen = (record, view = false) => {
+	open.value = true
+	if (record) {
+		qyInWarehouseApi.qyInWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
+			formData.value = Object.assign({
+				warehouseType: record.warehouseType
+			}, res)
+			formData.value.reWarehouseNumber = 'DOR93851000057565'
+			formData.value.warehouseNumber = 'RK1404110001'
+			formData.value.statementCode = 'PTR4606110A2020210713000369'
+			formData.value.hzCode = 'QD8013211000040997'
+			formData.value.purchaseType = '原材料采购'
+			formData.value.regulaMethod = '5015-区内进料加工货物'
+			formData.value.currency = '美元'
+			formData.value.qdgDq = '印度'
+			formData.value.inport = 'CHN925-洋浦（中国）'
+			formData.value.jjgb = '6408-洋浦港'
+			formData.value.zggqdm = '6408-洋浦保税港区'
+			formData.value.bgbz = '2-非报关'
+			formData.value.ysfs = '2-水路运输'
+			formData.value.qgldbj = '0'
+			formData.value.bssp = '1-保税'
+			formData.value.yxbgdh = 'QD8013211000040997'
+			formData.value.fhqybh = '9305869582'
+			formData.value.fhqymc = 'Sun Pharmaceutical Industries Ltd'
+			formData.value.wlbh = record.commodityCode
+			formData.value.wlmc = record.commodityName
+			formData.value.version = '1'
+			formData.value.hzqdxch = '012304584'
+			formData.value.jezce = 'B510518A0001'
+			formData.value.recordNum = 'LHTWL002'
+			formData.value.recordName = '进出港口原辅料'
+			formData.value.fjcpbz = '29362600'
+			formData.value.ggxh = '0'
+			formData.value.brandType = '制造商品牌'
+			formData.value.ycgdq = '印度'
+			formData.value.zzmdg = '中国'
+			formData.value.rkNum = record.accountNumber
+			formData.value.measurementUnit = '千克'
+			formData.value.unitPrice = '60'
+			formData.value.fyfdNum = '500'
+			formData.value.defdNum = ''
+			formData.value.zmfs = '国批减免'
+			formData.value.hcdm = 'INRD05017291'
+			formData.value.cwdm = '1A01-04-03'
+			formData.value.hwlyTpe = '企业自主声明'
+			formData.value.hwlyCode = 'PTR64082023032808192'
+		})
 	}
-	// 抛出函数
-	defineExpose({
-		onOpen
-	})
+	currencyOptions.value = tool.dictList('hbdm')
+
+}
+// 关闭抽屉
+const onClose = () => {
+	formRef.value?.resetFields()
+	formData.value = {}
+	open.value = false
+}
+// 抛出函数
+defineExpose({
+	onOpen
+})
 </script>
 <style lang="less" scoped>
-  .goods-detail {
-    max-height: 800px;
-    overflow-y: auto;
-  }
+.goods-detail {
+	max-height: 800px;
+	overflow-y: auto;
+}
 </style>

snowy-admin-web/src/views/yqyc/general-ledger/two/goods.vue

@@ -1,237 +1,240 @@
 <template>
 	<a-modal
-      v-model:open="open"
-      title="出库单"
-      centered
-      width="90%"
-  >
-      <div class="goods-detail">
-        <a-card>
-          <a-form ref="formRef" :model="formData">
-            <a-row :gutter="16">
-              <a-col :span="8">
-                <a-form-item label="出库单预录入编号" name="reWarehouseNumber">
-                  <a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="出库单编号" name="warehouseNumber">
-                  <a-input v-model:value="formData.warehouseNumber" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="二线出岛编号" name="statementCode">
-                  <a-input v-model:value="formData.statementCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="核注清单号" name="hzCode">
-                  <a-input v-model:value="formData.hzCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="企业编码" name="companyCode">
-                  <a-input v-model:value="formData.companyCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="企业名称" name="companyName">
-                  <a-input v-model:value="formData.companyName" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="采购类型" name="purchaseType">
-                  <a-input v-model:value="formData.purchaseType" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="监管方式" name="regulaMethod">
-                  <a-input v-model:value="formData.regulaMethod" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="币制" name="bz">
-					<a-select v-model:value="formData.bz" :disabled="isView" placeholder="请选择币制" :options="currencyOptions" show-search allow-clear option-filter-prop="label" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="启抵国(地区)" name="qdgDq">
-                  <a-input v-model:value="formData.qdgDq" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="出库日期" name="warehouseTime">
-                  <a-input v-model:value="formData.warehouseTime" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="进/出口岸" name="inport">
-                  <a-input v-model:value="formData.inport" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="进/出境关别" name="jjgb">
-                  <a-input v-model:value="formData.jjgb" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="主管关区代码" name="zggqdm">
-                  <a-input v-model:value="formData.zggqdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="报关标志" name="bgbz">
-                  <a-input v-model:value="formData.bgbz" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="运输方式" name="ysfs">
-                  <a-input v-model:value="formData.ysfs" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="区港联动标记" name="qgldbj">
-                  <a-input v-model:value="formData.qgldbj" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="是否为报税商品" name="bssp">
-                  <a-input v-model:value="formData.bssp" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="二线出岛报关单号" name="yxbgdh">
-                  <a-input v-model:value="formData.yxbgdh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="收货企业编号" name="fhqybh">
-                  <a-input v-model:value="formData.fhqybh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="收货企业名称" name="fhqymc">
-                  <a-input v-model:value="formData.fhqymc" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="24">
-                <a-form-item label="备注" name="remark">
-                  <a-textarea v-model:value="formData.remark" :disabled="true" :rows="4"/>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-form>
-        </a-card>
-        <a-card style="margin-top: 10px;">
-          <a-form ref="formRef" :model="formData">
-            <a-row :gutter="16">
-              <a-col :span="8">
-                <a-form-item label="物料编号" name="wlbh">
-                  <a-input v-model:value="formData.wlbh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="物料名称" name="wlmc">
-                  <a-input v-model:value="formData.wlmc" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="版本号" name="version">
-                  <a-input v-model:value="formData.version" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="核注清单项次号" name="hzqdxch">
-                  <a-input v-model:value="formData.hzqdxch" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="金二账册号" name="jezce">
-                  <a-input v-model:value="formData.jezce" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="备案序号" name="recordNum">
-                  <a-input v-model:value="formData.recordNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="备案名称" name="recordName">
-                  <a-input v-model:value="formData.recordName" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="料件成品标志" name="fjcpbz">
-                  <a-input v-model:value="formData.fjcpbz" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="规格型号" name="ggxh">
-                  <a-input v-model:value="formData.ggxh" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="原产国(地区)" name="ycgdq">
-                  <a-input v-model:value="formData.ycgdq" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="出库数量" name="rkNum">
-                  <a-input v-model:value="formData.rkNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="计量单位" name="measurementUnit">
-                  <a-input v-model:value="formData.measurementUnit" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="单价" name="unitPrice">
-                  <a-input v-model:value="formData.unitPrice" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="第一法定数量" name="fyfdNum">
-                  <a-input v-model:value="formData.fyfdNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="第二法定数量" name="defdNum">
-                  <a-input v-model:value="formData.defdNum" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="征免方式" name="zmfs">
-                  <a-input v-model:value="formData.zmfs" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="货仓代码" name="hcdm">
-                  <a-input v-model:value="formData.hcdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="仓位代码" name="cwdm">
-                  <a-input v-model:value="formData.cwdm" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="货物来源单证类型" name="hwlyTpe">
-                  <a-input v-model:value="formData.hwlyTpe" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-              <a-col :span="8">
-                <a-form-item label="货物来源单证编号" name="hwlyCode">
-                  <a-input v-model:value="formData.hwlyCode" :disabled="true"/>
-                </a-form-item>
-              </a-col>
-            </a-row>
-          </a-form>
-          <a-table
-            style="margin-top: 10px"
-            bordered
-            :dataSource="[formData]"
-            :columns="[
+		v-model:open="open"
+		title="出库单"
+		centered
+		width="90%"
+	>
+		<div class="goods-detail">
+			<a-card>
+				<a-form ref="formRef" :model="formData">
+					<a-row :gutter="16">
+						<a-col :span="8">
+							<a-form-item label="出库单预录入编号" name="reWarehouseNumber">
+								<a-input v-model:value="formData.reWarehouseNumber" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="出库单编号" name="warehouseNumber">
+								<a-input v-model:value="formData.warehouseNumber" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="二线出岛编号" name="statementCode">
+								<a-input v-model:value="formData.statementCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="核注清单号" name="hzCode">
+								<a-input v-model:value="formData.hzCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="企业编码" name="companyCode">
+								<a-input v-model:value="formData.companyCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="企业名称" name="companyName">
+								<a-input v-model:value="formData.companyName" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="采购类型" name="purchaseType">
+								<a-input v-model:value="formData.purchaseType" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="监管方式" name="regulaMethod">
+								<a-input v-model:value="formData.regulaMethod" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="币制" name="bz">
+<!--								<a-select v-model:value="formData.bz" :disabled="true" placeholder="请选择币制"-->
+<!--										  :options="currencyOptions" show-search allow-clear-->
+<!--										  option-filter-prop="label"/>-->
+								<a-input v-model:value="formData.bz" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="起抵国(地区)" name="qdgDq">
+								<a-input v-model:value="formData.qdgDq" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="出库日期" name="warehouseTime">
+								<a-input v-model:value="formData.warehouseTime" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="进/出口岸" name="inport">
+								<a-input v-model:value="formData.inport" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="进/出境关别" name="jjgb">
+								<a-input v-model:value="formData.jjgb" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="主管关区代码" name="zggqdm">
+								<a-input v-model:value="formData.zggqdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="报关标志" name="bgbz">
+								<a-input v-model:value="formData.bgbz" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="运输方式" name="ysfs">
+								<a-input v-model:value="formData.ysfs" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="区港联动联动标记" name="qgldbj">
+								<a-input v-model:value="formData.qgldbj" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="是否为保税商品" name="bssp">
+								<a-input v-model:value="formData.bssp" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="二线出岛报关单号" name="yxbgdh">
+								<a-input v-model:value="formData.yxbgdh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="收货企业编号" name="fhqybh">
+								<a-input v-model:value="formData.fhqybh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="收货企业名称" name="fhqymc">
+								<a-input v-model:value="formData.fhqymc" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="备注" name="remark">
+								<a-textarea v-model:value="formData.remark" :disabled="true" :rows="4"/>
+							</a-form-item>
+						</a-col>
+					</a-row>
+				</a-form>
+			</a-card>
+			<a-card style="margin-top: 10px;">
+				<a-form ref="formRef" :model="formData">
+					<a-row :gutter="16">
+						<a-col :span="8">
+							<a-form-item label="物料编号" name="wlbh">
+								<a-input v-model:value="formData.wlbh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="物料名称" name="wlmc">
+								<a-input v-model:value="formData.wlmc" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="版本号" name="version">
+								<a-input v-model:value="formData.version" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="核注清单项次号" name="hzqdxch">
+								<a-input v-model:value="formData.hzqdxch" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="金二账册号" name="jezce">
+								<a-input v-model:value="formData.jezce" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="备案序号" name="recordNum">
+								<a-input v-model:value="formData.recordNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="备案名称" name="recordName">
+								<a-input v-model:value="formData.recordName" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="料件成品标志" name="fjcpbz">
+								<a-input v-model:value="formData.fjcpbz" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="规格型号" name="ggxh">
+								<a-input v-model:value="formData.ggxh" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="原产国(地区)" name="ycgdq">
+								<a-input v-model:value="formData.ycgdq" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="出库数量" name="rkNum">
+								<a-input v-model:value="formData.rkNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="计量单位" name="measurementUnit">
+								<a-input v-model:value="formData.measurementUnit" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="单价" name="unitPrice">
+								<a-input v-model:value="formData.unitPrice" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="第一法定数量" name="fyfdNum">
+								<a-input v-model:value="formData.fyfdNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="第二法定数量" name="defdNum">
+								<a-input v-model:value="formData.defdNum" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="征免方式" name="zmfs">
+								<a-input v-model:value="formData.zmfs" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货仓代码" name="hcdm">
+								<a-input v-model:value="formData.hcdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="仓位代码" name="cwdm">
+								<a-input v-model:value="formData.cwdm" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货物来源单证类型" name="hwlyTpe">
+								<a-input v-model:value="formData.hwlyTpe" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
+							<a-form-item label="货物来源单证编号" name="hwlyCode">
+								<a-input v-model:value="formData.hwlyCode" :disabled="true"/>
+							</a-form-item>
+						</a-col>
+					</a-row>
+				</a-form>
+				<a-table
+					style="margin-top: 10px"
+					bordered
+					:dataSource="[formData]"
+					:columns="[
               {title: '物料编号',dataIndex: 'wlbh',key: 'wlbh'},
               {title: '物料名称',dataIndex: 'wlmc',key: 'wlmc'},
               {title: '规格型号',dataIndex: 'ggxh',key: 'ggxh'},
@@ -240,57 +243,94 @@
               {title: '单价',dataIndex: 'unitPrice',key: 'unitPrice'},
               {title: '操作',dataIndex: 'action',key: 'action'},
             ]"
-            :pagination="false"
-          >
-            <template #bodyCell="{ column, record }">
-              <template v-if="column.dataIndex === 'action'">
-                <a-button type="link" primary size="small">查看</a-button>
-              </template>
-            </template>
-          </a-table>
-        </a-card>
-      </div>
-      <template #footer></template>
+					:pagination="false"
+				>
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'action'">
+							<a-button type="link" primary size="small">查看</a-button>
+						</template>
+					</template>
+				</a-table>
+			</a-card>
+		</div>
+		<template #footer></template>
 	</a-modal>
 </template>
 
 <script setup name="enterpriseDetail">
-	import tool from '@/utils/tool'
-	import { cloneDeep } from 'lodash-es'
-  import qyOutWarehouseApi from "@/api/yqyc/qyOutWarehouseApi";
-	// 抽屉状态
-	const open = ref(false)
-	const emit = defineEmits({ successful: null })
-	const formRef = ref()
-	// 表单数据
-	const formData = ref({})
-	const currencyOptions = ref([])
+import tool from '@/utils/tool'
+import {cloneDeep} from 'lodash-es'
+import qyOutWarehouseApi from "@/api/yqyc/qyOutWarehouseApi";
+// 抽屉状态
+const open = ref(false)
+const emit = defineEmits({successful: null})
+const formRef = ref()
+// 表单数据
+const formData = ref({})
+const currencyOptions = ref([])
 
-	// 打开抽屉
-	const onOpen = (record, view = false) => {
-		open.value = true
-		if (record) {
-      qyOutWarehouseApi.qyOutWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
-        formData.value = Object.assign({}, res)
-      })
-		}
-		currencyOptions.value = tool.dictList('hbdm')
-
-	}
-	// 关闭抽屉
-	const onClose = () => {
-		formRef.value?.resetFields()
-		formData.value = {}
-		open.value = false
+// 打开抽屉
+const onOpen = (record, view = false) => {
+	open.value = true
+	if (record) {
+		qyOutWarehouseApi.qyOutWarehousePage({warehouseNumber: record.warehouseNumber}).then(res => {
+			formData.value = Object.assign({}, res)
+			formData.value.reWarehouseNumber = '231200510124430875'
+			formData.value.statementCode = '537766157584191973'
+			formData.value.hzCode = 'QD8013211000040997'
+			formData.value.purchaseType = '原材料采购'
+			formData.value.regulaMethod = '5015-区内进料加工货物'
+			formData.value.bz = '人民币'
+			formData.value.qdgDq = '中国'
+			formData.value.inport = 'CHN925-洋浦（中国）'
+			formData.value.jjgb = '6408-洋浦港'
+			formData.value.zggqdm = '6408-洋浦保税港区'
+			formData.value.bgbz = '1-报关'
+			formData.value.ysfs = '2-水路运输'
+			formData.value.qgldbj = '0'
+			formData.value.bssp = '1-保税'
+			formData.value.yxbgdh = '537766157584191973'
+			formData.value.fhqybh = '9305869582'
+			formData.value.fhqymc = '郑州市第一附属医院'
+			formData.value.wlbh = record.commodityCode
+			formData.value.wlmc = record.commodityName
+			formData.value.version = '1'
+			formData.value.hzqdxch = '012304584'
+			formData.value.jezce = 'B510518A0001'
+			formData.value.recordNum = 'LHTWL002'
+			formData.value.recordName = '进出港口原辅料'
+			formData.value.fjcpbz = '29362600'
+			formData.value.ggxh = '0'
+			formData.value.ycgdq = '中国'
+			formData.value.rkNum = record.accountNumber
+			formData.value.measurementUnit = '千克'
+			formData.value.unitPrice = '60'
+			formData.value.fyfdNum = '500'
+			formData.value.defdNum = '500'
+			formData.value.zmfs = '国批减免'
+			formData.value.hcdm = 'INRD05017291'
+			formData.value.cwdm = '1A01-04-03'
+			formData.value.hwlyTpe = '检验证书'
+			formData.value.hwlyCode = '475161698794'
+		})
 	}
-	// 抛出函数
-	defineExpose({
-		onOpen
-	})
+	currencyOptions.value = tool.dictList('hbdm')
+
+}
+// 关闭抽屉
+const onClose = () => {
+	formRef.value?.resetFields()
+	formData.value = {}
+	open.value = false
+}
+// 抛出函数
+defineExpose({
+	onOpen
+})
 </script>
 <style lang="less" scoped>
-  .goods-detail {
-    max-height: 800px;
-    overflow-y: auto;
-  }
+.goods-detail {
+	max-height: 800px;
+	overflow-y: auto;
+}
 </style>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/BizDictService.java

@@ -68,4 +68,6 @@ public interface BizDictService extends IService<BizDict> {
      * @date 2022/4/24 21:18
      */
     BizDict queryEntity(String id);
+
+    String getNameByType(String dataType,String dataValue);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/dict/service/impl/BizDictServiceImpl.java

@@ -154,4 +154,30 @@ public class BizDictServiceImpl extends ServiceImpl<BizDictMapper, BizDict> impl
             return null;
         });
     }
+
+    /**
+     * 根据字典类型和字典值查询名称
+     * @param dataType
+     * @param dataValue
+     * @return
+     */
+    @Override
+    public String getNameByType(String dataType,String dataValue){
+        QueryWrapper<BizDict> queryWrapper = new QueryWrapper<BizDict>().checkSqlInjection();
+        queryWrapper.lambda()
+                .eq(BizDict::getDictValue,dataType)
+                .eq(BizDict::getParentId,"0");
+        BizDict bizDict = this.getOne(queryWrapper);
+        if(bizDict != null){
+            QueryWrapper<BizDict> dataQuery = new QueryWrapper<BizDict>().checkSqlInjection();
+            dataQuery.lambda()
+                    .eq(BizDict::getParentId,bizDict.getParentId())
+                    .eq(BizDict::getDictValue,dataType);
+            BizDict dataBizDict = this.getOne(dataQuery);
+            if(dataBizDict != null){
+                return dataBizDict.getDictLabel();
+            }
+        }
+        return "";
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehfd/service/impl/QySecondlineHfdServiceImpl.java

@@ -87,7 +87,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
     public Page<QySecondlineHfd> page(QySecondlineHfdPageParam qySecondlineHfdPageParam) {
         QueryWrapper<QySecondlineHfd> queryWrapper = new QueryWrapper<QySecondlineHfd>().checkSqlInjection();
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getIds())) {
-            queryWrapper.lambda().eq(QySecondlineHfd::getId, qySecondlineHfdPageParam.getIds());
+            queryWrapper.lambda().in(QySecondlineHfd::getId, qySecondlineHfdPageParam.getIds());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getSblx())) {
             queryWrapper.lambda().eq(QySecondlineHfd::getSblx, qySecondlineHfdPageParam.getSblx());
@@ -108,16 +108,18 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
             queryWrapper.lambda().eq(QySecondlineHfd::getStatus, qySecondlineHfdPageParam.getStatus());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHfdPageParam.getHfdrCode())) {
-            queryWrapper.lambda().eq(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
+            queryWrapper.lambda().like(QySecondlineHfd::getHfdrCode, qySecondlineHfdPageParam.getHfdrCode());
         }
         if(ObjectUtil.isAllNotEmpty(qySecondlineHfdPageParam.getSortField(), qySecondlineHfdPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(qySecondlineHfdPageParam.getSortOrder());
             queryWrapper.orderBy(true, qySecondlineHfdPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(qySecondlineHfdPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(QySecondlineHfd::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHfd::getSblx);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineHfd> defaultPage = CommonPageRequest.defaultPage();
+        defaultPage.setSize(Integer.MAX_VALUE);
+        return this.page(defaultPage, queryWrapper);
     }
 
 
@@ -252,6 +254,7 @@ public class QySecondlineHfdServiceImpl extends ServiceImpl<QySecondlineHfdMappe
         qySecondlineHfdListSh.setCheckTime(date);
         qySecondlineHfdListSh.setStatus("审核通过");
         qySecondlineHfdListSh.setApplyMan(nickname);
+        qySecondlineHfdListSh.setApplicant(nickname);
         qySecondlineHfdListSh.setResult("提交成功，审核通过");
         qySecondlineHfdListSh.setApplyType(applyTypeName);
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/qysecondlinehzdtz/service/impl/QySecondlineHzdTzServiceImpl.java

@@ -92,7 +92,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
             queryWrapper.lambda().like(QySecondlineHzdTz::getTzCode, qySecondlineHzdTzPageParam.getTzCode());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getTzType())) {
-            queryWrapper.lambda().eq(QySecondlineHzdTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
+            queryWrapper.lambda().like(QySecondlineHzdTz::getTzType, qySecondlineHzdTzPageParam.getTzType());
         }
         if(ObjectUtil.isNotEmpty(qySecondlineHzdTzPageParam.getHgHzdCode())) {
             queryWrapper.lambda().like(QySecondlineHzdTz::getHgHzdCode, qySecondlineHzdTzPageParam.getHgHzdCode());
@@ -122,9 +122,11 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
             queryWrapper.orderBy(true, qySecondlineHzdTzPageParam.getSortOrder().equalsIgnoreCase(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(qySecondlineHzdTzPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByDesc(QySecondlineHzdTz::getId);
+            queryWrapper.lambda().orderByDesc(QySecondlineHzdTz::getSbsj);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        Page<QySecondlineHzdTz> objectPage = CommonPageRequest.defaultPage();
+        objectPage.setSize(Integer.MAX_VALUE);
+        return this.page(objectPage, queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -187,6 +189,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         qySecondlineHzdListSh.setCheckTime(date);
         qySecondlineHzdListSh.setStatus("审核通过");
         qySecondlineHzdListSh.setApplyMan(nickname);
+        qySecondlineHzdListSh.setApplicant(nickname);
         qySecondlineHzdListSh.setResult("提交成功，审核通过");
         qySecondlineHzdListSh.setApplyType(applyTypeName);
 
@@ -203,7 +206,7 @@ public class QySecondlineHzdTzServiceImpl extends ServiceImpl<QySecondlineHzdTzM
         if(CollectionUtil.isNotEmpty(productList)){
             List<QySecondlineHzdProduct> products = productList.stream().map(x -> {
                 QySecondlineHzdProduct qySecondlineHfdProduct = BeanUtil.toBean(x, QySecondlineHzdProduct.class);
-                x.setHzdId(hzdId);
+                qySecondlineHfdProduct.setHzdId(hzdId);
                 return qySecondlineHfdProduct;
             }).toList();
             qySecondlineHzdProductService.saveBatch(products);