From 870c41aa4a325d6e5e8b3e66f6bcaff0d91118c5 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 20 Apr 2024 22:46:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/PurchaseApplyList.vue      |  3 +-
 .../src/views/bill/dialog/BillDetail.vue      | 78 +++++++++++++++++++
 .../src/views/bill/dialog/HistoryBillList.vue |  2 +-
 .../views/bill/modules/PurchaseApplyModal.vue | 26 +------
 4 files changed, 81 insertions(+), 28 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue
index 1d2d774f..374ff672 100644
--- a/jshERP-web/src/views/bill/PurchaseApplyList.vue
+++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue
@@ -119,7 +119,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '采购订单', prefixNo)">查看</a>
+              <a @click="myHandleDetail(record, '请购单', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -206,7 +206,6 @@
               return text
             }
           },
-          { title: '关联订单', dataIndex: 'linkNumber',width:180},
           { title: '商品信息', dataIndex: 'materialsList',width:320, ellipsis:true},
           { title: '单据日期', dataIndex: 'operTimeStr',width:185},
           { title: '操作员', dataIndex: 'userName',width:120, ellipsis:true},
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 6674e2a5..ed00c2e0 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -14,6 +14,7 @@
       <!--此处为解决缓存问题-->
       <a-button v-if="billType === '零售出库'" v-print="'#retailOutPrint'">普通打印</a-button>
       <a-button v-if="billType === '零售退货入库'" v-print="'#retailBackPrint'">普通打印</a-button>
+      <a-button v-if="billType === '请购单'" v-print="'#purchaseApplyPrint'">普通打印</a-button>
       <a-button v-if="billType === '采购订单'" v-print="'#purchaseOrderPrint'">普通打印</a-button>
       <a-button v-if="billType === '采购入库'" v-print="'#purchaseInPrint'">普通打印</a-button>
       <a-button v-if="billType === '采购退货出库'" v-print="'#purchaseBackPrint'">普通打印</a-button>
@@ -28,6 +29,7 @@
       <a-button v-if="billType === '盘点复盘'" v-print="'#stockCheckReplayPrint'">普通打印</a-button>
       <!--导出Excel-->
       <a-button v-if="billType === '零售出库'||billType === '零售退货入库'" @click="retailExportExcel()">导出</a-button>
+      <a-button v-if="billType === '请购单'" @click="applyExportExcel()">导出</a-button>
       <a-button v-if="billType === '采购订单'||billType === '销售订单'" @click="orderExportExcel()">导出</a-button>
       <a-button v-if="billType === '采购入库'||billType === '采购退货出库'||billType === '销售出库'||billType === '销售退货入库'"
                 @click="purchaseSaleExportExcel()">导出</a-button>
@@ -211,6 +213,53 @@
           </a-row>
         </section>
       </template>
+      <!--请购单-->
+      <template v-else-if="billType === '请购单'">
+        <section ref="print" id="purchaseApplyPrint">
+          <a-row class="form-row" :gutter="24">
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+                {{model.operTimeStr}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+                {{model.number}}
+              </a-form-item>
+            </a-col>
+            <a-col :span="6">
+            </a-col>
+            <a-col :span="6">
+            </a-col>
+          </a-row>
+          <div :style="tableWidth">
+            <a-table
+              ref="table"
+              size="middle"
+              bordered
+              rowKey="id"
+              :pagination="false"
+              :loading="loading"
+              :columns="columns"
+              :dataSource="dataSource">
+              <template slot="customBarCode" slot-scope="text, record">
+                <div :style="record.imgName?'float:left;line-height:30px':'float:left;'">{{record.barCode}}</div>
+                <a-popover placement="right" trigger="click">
+                  <template slot="content"><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px" /></template>
+                  <div class="item-info" v-if="record.imgName"><img v-if="record.imgName" :src="getImgUrl(record.imgName, record.imgSmall)" class="item-img" title="查看大图" /></div>
+                </a-popover>
+              </template>
+            </a-table>
+          </div>
+          <a-row class="form-row" :gutter="24">
+            <a-col :lg="24" :md="24" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="" style="padding:20px 10px;">
+                {{model.remark}}
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </section>
+      </template>
       <!--采购订单-->
       <template v-else-if="billType === '采购订单'">
         <section ref="print" id="purchaseOrderPrint">
@@ -1222,6 +1271,19 @@
           { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
+        purchaseApplyColumns: [
+          { title: '条码', dataIndex: 'barCode'},
+          { title: '名称', dataIndex: 'name'},
+          { title: '规格', dataIndex: 'standard'},
+          { title: '型号', dataIndex: 'model'},
+          { title: '颜色', dataIndex: 'color'},
+          { title: '扩展信息', dataIndex: 'materialOther'},
+          { title: '单位', dataIndex: 'unit'},
+          { title: '多属性', dataIndex: 'sku'},
+          { title: '数量', dataIndex: 'operNumber'},
+          { title: '已采购', dataIndex: 'finishNumber'},
+          { title: '备注', dataIndex: 'remark'}
+        ],
         purchaseOrderColumns: [
           { title: '条码', dataIndex: 'barCode'},
           { title: '名称', dataIndex: 'name'},
@@ -1488,6 +1550,8 @@
           this.defColumns = this.retailOutColumns
         } else if (type === '零售退货入库') {
           this.defColumns = this.retailBackColumns
+        } else if (type === '请购单') {
+          this.defColumns = this.purchaseApplyColumns
         } else if (type === '采购订单') {
           this.defColumns = this.purchaseOrderColumns
         } else if (type === '采购入库') {
@@ -1774,6 +1838,20 @@
         let tip = organName + ' ' + '单据日期：' + this.model.operTimeStr + ' ' + '单据编号：' + this.model.number
         exportXlsPost(this.billType + '_' + this.model.number, '单据导出', head, tip, list)
       },
+      //请购单
+      applyExportExcel() {
+        let list = []
+        let head = '条码,名称,规格,型号,颜色,扩展信息,单位,多属性,原数量,已采购,数量,备注'
+        for (let i = 0; i < this.dataSource.length; i++) {
+          let item = []
+          let ds = this.dataSource[i]
+          item.push(ds.barCode, ds.name, ds.standard, ds.model, ds.color, ds.materialOther, ds.unit, ds.sku,
+            ds.preNumber, ds.finishNumber, ds.operNumber, ds.remark)
+          list.push(item)
+        }
+        let tip = '单据日期：' + this.model.operTimeStr + ' ' + '单据编号：' + this.model.number
+        exportXlsPost(this.billType + '_' + this.model.number, '单据导出', head, tip, list)
+      },
       //采购订单|销售订单
       orderExportExcel() {
         let list = []
diff --git a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
index 5dfb2e3a..0133037b 100644
--- a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
@@ -20,7 +20,7 @@
         <!-- 搜索区域 -->
         <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
-            <a-col :md="4" :sm="24">
+            <a-col :md="4" :sm="24" v-if="organLabel">
               <a-form-item :label="organLabel" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                 <a-select v-model="queryParam.organId" :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                   <a-select-option v-for="(item,index) in supplierList" :key="index" :value="item.id">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
index 2a262a1b..708c91c8 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
@@ -90,28 +90,19 @@
         </a-row>
       </a-form>
     </a-spin>
-    <many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
     <import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
-    <vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
-    <account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
-    <link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
     <history-bill-list ref="historyBillListModalForm"></history-bill-list>
     <workflow-iframe ref="modalWorkflow"></workflow-iframe>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
-  import ManyAccountModal from '../dialog/ManyAccountModal'
   import ImportItemModal from '../dialog/ImportItemModal'
-  import LinkBillList from '../dialog/LinkBillList'
-  import VendorModal from '../../system/modules/VendorModal'
-  import AccountModal from '../../system/modules/AccountModal'
   import HistoryBillList from '../dialog/HistoryBillList'
   import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
-  import { getCurrentSystemConfig } from '@/api/api'
   import { getMpListShort, changeListFmtMinus,handleIntroJs } from "@/utils/util"
   import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
@@ -120,11 +111,7 @@
     name: "PurchaseApplyModal",
     mixins: [JEditableTableMixin,BillModalMixin],
     components: {
-      ManyAccountModal,
       ImportItemModal,
-      LinkBillList,
-      VendorModal,
-      AccountModal,
       HistoryBillList,
       WorkflowIframe,
       JUpload,
@@ -239,8 +226,7 @@
           }
           this.fileList = this.model.fileName
           this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
-            'discount','discountMoney','discountLastMoney','accountId','changeAmount'))
+            this.form.setFieldsValue(pick(this.model, 'operTime', 'number', 'remark'))
           });
           // 加载子表数据
           let params = {
@@ -258,8 +244,6 @@
           this.copyAddInit(this.prefixNo)
         }
         this.initSystemConfig()
-        this.initSupplier()
-        this.initAccount()
       },
       /** 整理成formData */
       classifyIntoFormData(allValues) {
@@ -270,17 +254,9 @@
         billMain.subType = '请购单'
         billMain.defaultNumber = billMain.number
         for(let item of detailArr){
-          item.depotId = '' //订单不需要仓库
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = 0-totalPrice
-        billMain.changeAmount = 0-billMain.changeAmount
-        if(billMain.accountId === 0) {
-          billMain.accountId = ''
-        }
-        this.accountMoneyList = changeListFmtMinus(this.accountMoneyList)
-        billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
-        billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
         if(this.fileList && this.fileList.length > 0) {
           billMain.fileName = this.fileList
         } else {