径予调整

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

@@ -19,7 +19,7 @@
         <a-col :span="6">
           <a-form-item label="账册类型" name="accountType">
             <a-select v-model:value="searchFormState.accountType" placeholder="请选择账册类型"
-                      :options="accountTypeOptions" show-search allow-clear option-filter-prop="label"/>
+                      :options="tzlxOptions" show-search allow-clear option-filter-prop="label"/>
           </a-form-item>
         </a-col>
         <a-col :span="6" v-show="advanced">
@@ -140,7 +140,7 @@
           </a-button>
         </template>
         <template v-if="column.dataIndex === 'accountType'">
-          {{ $TOOL.dictTypeData('account_type', record.accountType) }}
+          {{ $TOOL.dictTypeData('tzlx', record.accountType) }}
         </template>
         <template v-if="column.dataIndex === 'businessType'">
           {{ $TOOL.dictTypeData('bussiness_type', record.businessType) }}
@@ -375,7 +375,7 @@ const onPrint = () => {
     printJS(res, 'pdf')
   })
 }
-const accountTypeOptions = tool.dictList('account_type')
+const tzlxOptions = tool.dictList('tzlx')
 const businessTypeOptions = tool.dictList('bussiness_type')
 const measurementUnitOptions = tool.dictList('measurement unit')
 </script>

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

@@ -15,17 +15,12 @@
         <a-col :span="6">
           <a-form-item label="账册类型" name="accountType">
             <a-select v-model:value="searchFormState.accountType" placeholder="请选择账册类型"
-                      :options="accountTypeOptions" show-search allow-clear optionFilterProp="label"/>
+                      :options="tzlxOptions" show-search allow-clear optionFilterProp="label"/>
           </a-form-item>
         </a-col>
         <a-col :span="6" v-show="advanced">
-          <a-form-item label="账册编号" name="accountCode">
-            <a-input v-model:value="searchFormState.accountCode" placeholder="请输入账册编号" allow-clear/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6" v-show="advanced">
-          <a-form-item label="商品编号" name="commodityCode">
-            <a-input v-model:value="searchFormState.commodityCode" placeholder="请输入商品编号" allow-clear/>
+          <a-form-item label="商品编码" name="commodityCode">
+            <a-input v-model:value="searchFormState.commodityCode" placeholder="请输入商品编码" allow-clear/>
           </a-form-item>
         </a-col>
         <a-col :span="6" v-show="advanced">
@@ -64,12 +59,7 @@
           </a-form-item>
         </a-col>
         <a-col :span="6" v-show="advanced">
-          <a-form-item label="出库单号" name="warehouseNumber">
-            <a-input v-model:value="searchFormState.warehouseNumber" placeholder="请输入出库单号" allow-clear/>
-          </a-form-item>
-        </a-col>
-        <a-col :span="6" v-show="advanced">
-          <a-form-item label="出库日期" name="warehouseTime">
+          <a-form-item label="出/入库日期" name="warehouseTime">
             <a-range-picker v-model:value="searchFormState.warehouseTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
@@ -78,6 +68,16 @@
             <a-range-picker v-model:value="searchFormState.accountTime" show-time allow-clear/>
           </a-form-item>
         </a-col>
+		<a-col :span="6" v-show="advanced">
+		  <a-form-item label="账册编号" name="accountCode">
+		    <a-input v-model:value="searchFormState.accountCode" placeholder="请输入账册编号" allow-clear/>
+		  </a-form-item>
+		</a-col>
+	    <a-col :span="6" v-show="advanced">
+		  <a-form-item label="出/入库单号" name="warehouseNumber">
+			  <a-input v-model:value="searchFormState.warehouseNumber" placeholder="请输入出库单号" allow-clear/>
+		  </a-form-item>
+	    </a-col>
         <a-col :span="6">
           <a-button type="primary" @click="onSearch()">查询</a-button>
           <a-button style="margin: 0 8px" @click="reset">重置</a-button>
@@ -102,17 +102,17 @@
     >
       <template #operator class="table-operator">
         <a-space>
-          <a-button type="primary" @click="onDetail()" v-if="hasPerm('qySecondlineWarehouseAdd')">
-            <template #icon>
-              <plus-outlined/>
-            </template>
-            新增
-          </a-button>
-          <xn-batch-delete
-            v-if="hasPerm('qySecondlineWarehouseDelete')"
-            :selectedRowKeys="selectedRowKeys"
-            @batchDelete="deleteBatchQySecondlineWarehouse"
-          />
+<!--          <a-button type="primary" @click="onDetail()" v-if="hasPerm('qySecondlineWarehouseAdd')">-->
+<!--            <template #icon>-->
+<!--              <plus-outlined/>-->
+<!--            </template>-->
+<!--            新增-->
+<!--          </a-button>-->
+<!--          <xn-batch-delete-->
+<!--            v-if="hasPerm('qySecondlineWarehouseDelete')"-->
+<!--            :selectedRowKeys="selectedRowKeys"-->
+<!--            @batchDelete="deleteBatchQySecondlineWarehouse"-->
+<!--          />-->
           <a-button @click="onExport" v-if="hasPerm('qySecondlineWarehouseBatchExport')">
             <template #icon>
               <export-outlined/>
@@ -134,7 +134,7 @@
           </a-button>
         </template>
         <template v-if="column.dataIndex === 'accountType'">
-          {{ $TOOL.dictTypeData('account_type', record.accountType) }}
+          {{ $TOOL.dictTypeData('tzlx', record.accountType) }}
         </template>
         <template v-if="column.dataIndex === 'businessType'">
           {{ $TOOL.dictTypeData('bussiness_type', record.businessType) }}
@@ -144,11 +144,11 @@
         </template>
         <template v-if="column.dataIndex === 'action'">
           <a-space>
-            <a @click="onDetail(record, true)" v-if="hasPerm('qySecondlineWarehouseView')">查看</a>
-            <a @click="onDetail(record)" v-if="hasPerm('qySecondlineWarehouseEdit')">编辑</a>
-            <a-popconfirm title="确定要删除吗？" @confirm="deleteQySecondlineWarehouse(record)">
-              <a-button type="link" danger size="small" v-if="hasPerm('qySecondlineWarehouseDelete')">删除</a-button>
-            </a-popconfirm>
+<!--            <a @click="onDetail(record, true)" v-if="hasPerm('qySecondlineWarehouseView')">查看</a>-->
+<!--            <a @click="onDetail(record)" v-if="hasPerm('qySecondlineWarehouseEdit')">编辑</a>-->
+<!--            <a-popconfirm title="确定要删除吗？" @confirm="deleteQySecondlineWarehouse(record)">-->
+<!--              <a-button type="link" danger size="small" v-if="hasPerm('qySecondlineWarehouseDelete')">删除</a-button>-->
+<!--            </a-popconfirm>-->
             <a-button type="link" primary size="small" @click="goodsDetailRef.onOpen(record)">出库单</a-button>
             <a-button type="link" primary size="small" @click="certificateDetailRef.onOpen(record)">记账凭证</a-button>
           </a-space>
@@ -209,7 +209,7 @@ const columns = ref([
     dataIndex: 'accountCode',
   },
   {
-    title: '商品编号',
+    title: '商品编码',
     dataIndex: 'commodityCode',
   },
   {
@@ -234,11 +234,11 @@ const columns = ref([
     dataIndex: 'secondlineOutislandNumber',
   },
   {
-    title: '出库单号',
+    title: '出/入库单号',
     dataIndex: 'warehouseNumber',
   },
   {
-    title: '出库日期',
+    title: '出/入库日期',
     dataIndex: 'warehouseTime',
     sorter: true,
   },
@@ -356,7 +356,7 @@ const onPrint = () => {
     printJS(res, 'pdf')
   })
 }
-const accountTypeOptions = tool.dictList('account_type')
+const tzlxOptions = tool.dictList('tzlx')
 const businessTypeOptions = tool.dictList('bussiness_type')
 const measurementUnitOptions = tool.dictList('measurement unit')
 </script>

snowy-admin-web/src/views/yqyc/zero/enterprise-ledger/detail.vue

@@ -93,7 +93,7 @@
 					</a-row>
 				</a-form>
 			</a-collapse-panel>
-			<a-collapse-panel key="2" header="料件信息">
+			<a-collapse-panel key="2" header="料件信息" v-if="showBodyCpt">
 				<a-button type="primary" @click="onBodyReset" v-if="!isView" style="margin-bottom: 20px;">重置</a-button>
 				<a-form ref="bodyFormRef" :model="bodyData" :rules="bodyRules" style="margin-bottom: 20px;">
 					<a-row :gutter="16">
@@ -1018,6 +1018,9 @@ const fileColumns = [
 		dataIndex: 'action',
 	},
 ]
+const showBodyCpt = computed(() => {
+	return formData.value.tzType == 3 || formData.value.tzType == 6
+})
 // 验证并提交数据
 const onSubmit = () => {
 	formRef.value
@@ -1026,11 +1029,11 @@ const onSubmit = () => {
 		submitLoading.value = true
 		const formDataParam = cloneDeep(formData.value)
 		if (!formDataParam.id) {
-			formDataParam.qyRecardBodyAddParams = bodyList.value
+			formDataParam.qyRecardBodyAddParams = showBodyCpt.value ? bodyList.value : []
 			formDataParam.qyRecordAttachmentAddParams = fileList.value
 			formDataParam.qyRecordProductAddParams = productList.value
 		} else {
-			formDataParam.qyRecardBodyEditParams = bodyList.value
+			formDataParam.qyRecardBodyEditParams = showBodyCpt.value ? bodyList.value : []
 			formDataParam.qyRecordAttachmentEditParams = fileList.value
 			formDataParam.qyRecordProductAddParams = productList.value
 			delete formDataParam.qyRecardBodyAddParams
@@ -1058,11 +1061,11 @@ const onTemp = () => {
 		submitLoading.value = true
 		const formDataParam = cloneDeep(formData.value)
 		if (!formDataParam.id) {
-			formDataParam.qyRecardBodyAddParams = bodyList.value
+			formDataParam.qyRecardBodyAddParams = showBodyCpt.value ? bodyList.value : []
 			formDataParam.qyRecordAttachmentAddParams = fileList.value
 			formDataParam.qyRecordProductAddParams = productList.value
 		} else {
-			formDataParam.qyRecardBodyEditParams = bodyList.value
+			formDataParam.qyRecardBodyEditParams = showBodyCpt.value ? bodyList.value : []
 			formDataParam.qyRecordAttachmentEditParams = fileList.value
 			formDataParam.qyRecordProductAddParams = productList.value
 			delete formDataParam.qyRecardBodyAddParams