jingbb il y a 1 an
Parent
commit
c7ac744d8f

+ 174 - 0
src/views/production/Popup/inventoryPopup.vue

@@ -0,0 +1,174 @@
+<template>
+    <a-modal
+      title="存货列表"
+       width="45%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @cancel="handleCancel"
+      @ok='handleOk'
+      >
+      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%">
+      <a-form-model ref="formRef">
+            <a-table
+            ref="table"
+            size="middle"
+            bordered
+            id='sonList'
+            :columns="columns"
+            rowKey="rowIndex"
+            :dataSource="dataSource"
+            :pagination="false"
+            :scroll="{ x: 800, y: 300 }"
+            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+            @change="handleTableChange"
+            >
+            </a-table>
+        </a-form-model>
+    </a-card >
+    </a-modal>
+  </template>
+  <script>
+  
+      import { FormTypes } from '@/utils/JEditableTableUtil'
+      import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
+      import moment from "moment"
+      import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+      export default {
+        name: 'operation',
+        mixins: [JEditableTableModelMixin],
+        components: {
+        },
+        data() {
+          return {
+            visible:false,
+            selectedRowKeys:[],
+            selectedRows:[],
+            dataSource:[],
+            columns:[
+                {
+                    title: '#',
+                    dataIndex: '',
+                    key: 'rowIndex',
+                    width: 60,
+                    align: "center",
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
+                {
+                    title: '存货名称',
+                    align:"center",
+                    dataIndex: 'Name',
+                    ellipsis: true,
+                },
+                {
+                    title: '存货编码',
+                    align:"center",
+                    dataIndex: 'Code',
+                    ellipsis: true,
+                },
+                {
+                    title: '规格',
+                    align:"center",
+                    dataIndex: 'SPECS',
+                    ellipsis: true,
+                },
+            ]
+          }
+        },
+        created() {
+          
+        },
+        methods: {
+            handleCancel(){
+                this.visible=false
+                this.dataSource = [] 
+            },
+            handleOk(){
+                if(this.selectedRowKeys.length!==1){
+                    this.$message.warning('请选择一条数据!')
+                }else{
+                    this.$emit('okData',this.selectedRows[0])
+                    this.handleCancel()
+                }
+            },
+            getData(){
+                getAction('/production/safetyStock/selectItemMaster',{pageNo:1,pageSize:3}).then(res=>{
+                        if(res){
+                          this.dataSource = res
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
+            },
+            onSelectChange(selectedRowKeys, selectionRows) {
+              this.selectedRowKeys = selectedRowKeys;
+              this.selectedRows = selectionRows;
+            },
+
+        }
+      }
+  </script>
+  
+  <style scoped lang="less">
+    /* @import '~@assets/less/common.less' */
+    /deep/.ant-input{
+        height:29px;
+    }
+    /deep/.ant-select-selection--single {
+        height: 29px;
+    }
+    /deep/.ant-select{
+        font-size: 12px;
+    }
+    /deep/.ant-form label{
+        font-size: 12px;
+    }
+    /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item{
+        margin-bottom:9px
+    }
+    /deep/.moddle>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.top>.ant-card-body{
+        padding-bottom: 12px;
+        padding-top: 12px;
+    }
+    /deep/.ant-btn{
+        height:28px
+    }
+    /deep/.ant-modal-body{
+        padding-bottom: 0px;
+        padding-top: 0px;
+    }
+    // /deep/.ant-modal-body{
+    //     background: #f0f2f5;
+    // }
+    /deep/.ant-modal-content{
+        background: #f0f2f5;
+    }
+    /deep/.ant-card-body .table-operator {
+        margin-bottom: 0px;
+    }
+    /deep/.three>.ant-card-body{
+        padding-bottom:12px;
+        padding-top: 12px;
+    }
+    /deep/.bottom>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+
+    /deep/.ant-calendar-picker{
+        min-width: 0px !important;  
+    }
+    /deep/.sonItem {
+        margin-bottom:0px !important
+    }
+    // /deep/#sonList>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
+    //     padding: 0px 8px !important;
+    // }
+  </style>

+ 13 - 3
src/views/production/safetyStock/modules/safetyStockListAdd.vue

@@ -14,7 +14,7 @@
               <a-row :gutter="24">
                 <a-col :md="8" :sm="24">
                   <a-form-item label="存货编码" prop='inventoryCode'>
-                    <a-input-search placeholder="请输入" v-model="form.inventoryCode" @search="onSearch"></a-input-search>
+                    <a-input-search placeholder="请输入" v-model="form.inventoryCode" @search="onSearchInvebtory"></a-input-search>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="8" :sm="24">
@@ -109,6 +109,7 @@
             </a-form>
         </div>
      </a-card>
+     <inventoryPopup ref="inventoryPopup" @okData="okData"></inventoryPopup>
     </a-modal>
   </template>
   <script>
@@ -117,10 +118,12 @@
       import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+      import inventoryPopup from '../../Popup/inventoryPopup.vue'
       export default {
         name: 'safetyStockListAdd',
         mixins: [JEditableTableModelMixin],
         components: {
+          inventoryPopup
         },
         data() {
           return {
@@ -165,8 +168,7 @@
                 }).finally(() => {
                   this.loading = false
                 })
-              }
-              
+              }  
             },
             getEditData(id){
               getAction('/production/safetyStock/queryById',{id:id}).then((res) => {
@@ -180,8 +182,16 @@
             onSelectChange(selectedRowKeys, selectionRows) {
                 this.selectedRowKeys = selectedRowKeys;
             },
+            okData(data){
+              this.$set(this.form,'inventoryCode',data.Code)
+              this.$set(this.form,'inventoryName',data.Name)
+            },
             onSearch(){
             },
+            onSearchInvebtory(){
+              this.$refs.inventoryPopup.visible = true
+              this.$refs.inventoryPopup.getData()
+            }
 
         }
       }

+ 14 - 2
src/views/production/safetyStock/safetyStockList.vue

@@ -8,7 +8,7 @@
               <a-row :gutter="24">
                 <a-col :md="4" :sm="24">
                   <a-form-item label="存货编码">
-                    <a-input-search placeholder="请输入" v-model="queryParam.inventoryCode" @search="onSearch"></a-input-search>
+                    <a-input-search placeholder="请输入" v-model="queryParam.inventoryCode" @search="onSearchInvebtory"></a-input-search>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="4" :sm="24">
@@ -153,6 +153,7 @@
         </a-card>
         <safetyStockListAdd ref="safetyStockListAdd" @ok='getTableList'></safetyStockListAdd>
         <safetyStockListDetail ref="safetyStockListDetail"></safetyStockListDetail>
+        <inventoryPopup ref="inventoryPopup" @okData="okData"></inventoryPopup>
     </div>
     </template>
       
@@ -164,13 +165,15 @@
         import {queryDepartTreeList} from '@/api/api'
         import safetyStockListAdd from './modules/safetyStockListAdd'
         import safetyStockListDetail from './modules/safetyStockListDetail'
+        import inventoryPopup from '../Popup/inventoryPopup'
         //---------workflow  by fhf end -------------
         export default {
           name: "SafetyStockList",
           mixins: [JeecgListMixin],
           components: {
             safetyStockListAdd,
-            safetyStockListDetail
+            safetyStockListDetail,
+            inventoryPopup
           },
           data () {
             return {
@@ -489,6 +492,15 @@
                 this.$refs.safetyStockListDetail.getEditData(this.selectedRowKeys[0])
               }
             },
+            okData(data){
+              this.$set(this.queryParam,'inventoryCode',data.Code)
+              this.
+              $set(this.queryParam,'inventoryName',data.Name)
+            },
+            onSearchInvebtory(){
+              this.$refs.inventoryPopup.visible = true
+              this.$refs.inventoryPopup.getData()
+            },
             //双击
             clickRow(record, index){
               return {