From d2286de4e08fae59ea2d00ce15a3b27ecf38853d Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 14 Feb 2023 22:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=B8=85=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/modal/ProcessPlan.vue    |   5 +
 .../form/ProcessMaterialWarehousingForm.vue   |   6 -
 .../ProcessMaterialWarehousingApplyiList.vue  | 322 ++++++++++++++++++
 3 files changed, 327 insertions(+), 6 deletions(-)
 create mode 100644 src/views/processmaterials/ProcessMaterialWarehousingApplyiList.vue

diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index c759969..118c328 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -159,6 +159,9 @@
         <a-tab-pane tab="预算计划采购流程物料已入清单表" key="2">
           <ProcessMaterialWarehousingListList :mainId="selectedMainId" />
         </a-tab-pane>
+        <a-tab-pane tab="预算计划采购流程物料已申请清单表" key="3">
+          <ProcessMaterialWarehousingApplyiList :mainId="selectedMainId" />
+        </a-tab-pane>
       </a-tabs>
     </a-card>
 
@@ -171,6 +174,7 @@ import { getAction } from '@/api/manage'
 import { filterObj } from '@/utils/util'
 import ProcessUdgetPlanMaterialList from '../../../views/processmaterials/ProcessUdgetPlanMaterialList'
 import ProcessMaterialWarehousingListList from '@views/processmaterials/ProcessMaterialWarehousingListList'
+import ProcessMaterialWarehousingApplyiList from '../../../views/processmaterials/ProcessMaterialWarehousingApplyiList'
 import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
 import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
 import '@/assets/less/TableExpand.less'
@@ -182,6 +186,7 @@ export default {
   components: {
     ProcessUdgetPlanMaterialList,
     ProcessMaterialWarehousingListList,
+    ProcessMaterialWarehousingApplyiList,
     JSuperQuery,
     JDictSelectTag
   },
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index b730635..35d80cc 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -588,10 +588,7 @@
             console.log('表单回显数据21', this.warehousingQuantity)
             if(this.planQuantity-this.warehousingQuantity-formData.processMaterialWarehousingListList[i].materialQuantity<0){
               this.$message.error('入库数量不能大于采购数量')
-              this.quantityChange=false;
               return;
-            }else {
-              this.quantityChange=true;
             }
             if (formData.processMaterialWarehousingListList[i].materialPrice*formData.processMaterialWarehousingListList[i].materialQuantity!=formData.processMaterialWarehousingListList[i].materialAmount){
               this.$message.error('请检查入库数量');
@@ -695,10 +692,7 @@
             console.log('表单回显数据21', this.warehousingQuantity)
             if(this.planQuantity-this.warehousingQuantity-formData.processMaterialWarehousingListList[i].materialQuantity<0){
               this.$message.error('入库数量不能大于采购数量')
-              this.quantityChange=false;
               return;
-            }else {
-              this.quantityChange=true;
             }
             if (formData.processMaterialWarehousingListList[i].materialPrice*formData.processMaterialWarehousingListList[i].materialQuantity!=formData.processMaterialWarehousingListList[i].materialAmount){
               this.$message.error('请检查入库数量');
diff --git a/src/views/processmaterials/ProcessMaterialWarehousingApplyiList.vue b/src/views/processmaterials/ProcessMaterialWarehousingApplyiList.vue
new file mode 100644
index 0000000..8f7e7d2
--- /dev/null
+++ b/src/views/processmaterials/ProcessMaterialWarehousingApplyiList.vue
@@ -0,0 +1,322 @@
+<template>
+  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+    <!-- 操作按钮区域 -->
+<!--    <div class="table-operator" v-if="mainId">-->
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程清单表')">导出</a-button>-->
+<!--      <a-upload-->
+<!--        name="file"-->
+<!--        :showUploadList="false"-->
+<!--        :multiple="false"-->
+<!--        :headers="tokenHeader"-->
+<!--        :action="importExcelUrl"-->
+<!--        @change="handleImportExcel">-->
+<!--          <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+<!--    </div>-->
+
+<!--    &lt;!&ndash; table区域-begin &ndash;&gt;-->
+    <div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :scroll="{y:300}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+
+<!--        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
+        <template slot="materialDescription" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="5"/>
+        </template>
+        <template slot="supplierId" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="5"/>
+        </template>
+
+        <!--        <template slot="htmlSlot" slot-scope="text">-->
+<!--          <div v-html="text"></div>-->
+<!--        </template>-->
+<!--        <template slot="imgSlot" slot-scope="text">-->
+<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
+<!--          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
+<!--        </template>-->
+<!--        <template slot="fileSlot" slot-scope="text">-->
+<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
+<!--          <a-button-->
+<!--            v-else-->
+<!--            :ghost="true"-->
+<!--            type="primary"-->
+<!--            icon="download"-->
+<!--            size="small"-->
+<!--            @click="downloadFile(text)">-->
+<!--            下载-->
+<!--          </a-button>-->
+<!--        </template>-->
+
+<!--        <span slot="action" slot-scope="text, record">-->
+<!--          <a @click="handleEdit(record)">编辑</a>-->
+<!--          <a-divider type="vertical" />-->
+<!--          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--            <a>删除</a>-->
+<!--          </a-popconfirm>-->
+<!--        </span>-->
+
+      </a-table>
+    </div>
+
+<!--    <processMaterialWarehousingList-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></processMaterialWarehousingList-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessMaterialWarehousingListModal from './modules/ProcessMaterialWarehousingListModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+
+  export default {
+    name: "ProcessMaterialWarehousingListList",
+    mixins:[JeecgListMixin],
+    components: { ProcessMaterialWarehousingListModal,JSuperQuery },
+    props: {
+      mainId: {
+        type: String,
+        required: false
+      }
+    },
+    watch:{
+      mainId:{
+        immediate: true,
+        handler(val) {
+          console.log("val============",val)
+          if(!this.mainId){
+            this.clearList()
+          }else{
+            this.queryParam['id'] = val
+            this.loadData(1);
+          }
+        }
+      }
+    },
+    data () {
+      return {
+        description: '物资入库流程管理页面',
+        disableMixinCreated:true,
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'物料组',
+            align:"center",
+            dataIndex: 'materialClassify',
+          },
+          {
+            title:'物料号',
+            align:"center",
+            dataIndex: 'materialNumber',
+          },
+          {
+            title:'物料名称及规格型号',
+            align:"center",
+            scopedSlots: { customRender: 'materialDescription' },
+            dataIndex: 'materialDescription',
+          },
+          // {
+          //   title:'仓储地点_id',
+          //   align:"center",
+          //   dataIndex: 'unitWasteWarehouseCodeId_dictText',
+          // },
+          // {
+          //   title:'生产时间',
+          //   align:"center",
+          //   dataIndex: 'productionTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'保质期',
+          //   align:"center",
+          //   dataIndex: 'expirationDate',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'是否到货',
+          //   align:"center",
+          //   dataIndex: 'arrivalNotice_dictText',
+          // },
+          // {
+          //   title:'器材编号',
+          //   align:"center",
+          //   dataIndex: 'equipment_dictText',
+          // },
+          {
+            title:'WBS',
+            align:"center",
+            dataIndex: 'wbs',
+          },
+          // {
+          //   title:'物料名称及规格型号',
+          //   align:"center",
+          //   dataIndex: 'materialName_dictText',
+          // },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'materialUnit',
+          },
+          {
+            title:'单价',
+            align:"center",
+            dataIndex: 'materialPrice'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'materialQuantity'
+          },
+          // {
+          //   title:'金额',
+          //   align:"center",
+          //   dataIndex: 'materialAmount'
+          // },
+          {
+            title:'供应商',
+            align:"center",
+            scopedSlots: { customRender: 'supplierId' },
+            dataIndex: 'supplierId'
+          },
+          {
+            title:'批次',
+            align:"center",
+            dataIndex: 'supplierBatch'
+          },
+          {
+            title:'入库时间',
+            align:"center",
+            dataIndex: 'storageTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'入库人',
+            align:"center",
+            dataIndex: 'librarySign',
+          },
+          // {
+          //   title:'核算属性',
+          //   align:"center",
+          //   dataIndex: 'accountingAttributes_dictText',
+          // },
+          // {
+          //   title:'批次入库时间',
+          //   align:"center",
+          //   dataIndex: 'warehousingTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'用途',
+          //   align:"center",
+          //   dataIndex: 'purpose'
+          // },
+          // {
+          //   title:'删除标志',
+          //   align:"center",
+          //   dataIndex: 'defFlag'
+          // },
+          // {
+          //   title:'删除时间',
+          //   align:"center",
+          //   dataIndex: 'delTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' },
+          // }
+        ],
+        url: {
+          list: "/hy/processMaterialWarehousing/queryMaterialWarehousingApplyListByMainId",
+          delete: "/hy/processMaterialWarehousing/deleteProcessMaterialWarehousingList",
+          deleteBatch: "/hy/processMaterialWarehousing/deleteBatchProcessMaterialWarehousingList",
+          exportXlsUrl: "/hy/processMaterialWarehousing/exportProcessMaterialWarehousingList",
+          importUrl: "/hy/processMaterialWarehousing/importProcessMaterialWarehousingList",
+        },
+        dictOptions:{
+         company:[],
+         sysOrgCode:[],
+        },
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl(){
+        return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+      }
+    },
+    methods: {
+      clearList(){
+        this.dataSource=[]
+        this.selectedRowKeys=[]
+        this.ipagination.current = 1
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_depart',value:'company',text:'流程发起公司'})
+        fieldList.push({type:'datetime',value:'createTime',text:'流程发起时间'})
+        fieldList.push({type:'sel_depart',value:'sysOrgCode',text:'流程发起部门'})
+        fieldList.push({type:'sel_user',value:'createBy',text:'流程发起人'})
+        fieldList.push({type:'string',value:'processUdgetPlanId',text:'关联预算流程',dictCode:''})
+        fieldList.push({type:'int',value:'materialType',text:'物资类型',dictCode:''})
+        fieldList.push({type:'int',value:'targetLibrary',text:'入库目标库',dictCode:''})
+        fieldList.push({type:'int',value:'warehousingBatch',text:'入库总批次',dictCode:''})
+        fieldList.push({type:'string',value:'fileId',text:'文件id',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>