存货档案，项目档案，组织档案，部门档案，业务员档案

src/views/production/Popup/OperatorsPopup.vue

@@ -0,0 +1,197 @@
+<template>
+    <a-modal
+      title="业务员列表"
+       width="60%"
+      :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='sonList1'
+            :columns="columns"
+            rowKey="rowIndex"
+            :dataSource="dataSource"
+            :pagination="pagination"
+            :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: 'OperatorsPopup',
+        mixins: [JEditableTableModelMixin],
+        components: {
+        },
+        data() {
+          return {
+            visible:false,
+            selectedRowKeys:[],
+            selectedRows:[],
+            dataSource:[],
+            pagination:{
+                current: 1,
+                pageSize: 5,
+                pageSizeOptions: ['5', '10', '20'],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条"
+                },
+                showQuickJumper: true,
+                showSizeChanger: true,
+                total: 0
+            },
+            queryParam:{
+                pageNo:1
+            },
+            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: 'ID',
+                    align:"center",
+                    dataIndex: 'ID',
+                    ellipsis: true,
+                },
+            ]
+          }
+        },
+        created() {
+          
+        },
+        methods: {
+            handleCancel(){
+                this.visible=false
+                this.dataSource = [] 
+                this.selectedRowKeys = []
+                this.selectedRows = []
+            },
+            handleOk(){
+                if(this.selectedRowKeys.length!==1){
+                    this.$message.warning('请选择一条数据！')
+                }else{
+                    this.$emit('okData',this.selectedRows[0])
+                    this.handleCancel()
+                }
+            },
+            getData(){
+                getAction('/production/safetyStock/selectOperators',this.queryParam).then(res=>{
+                        if(res.success){
+                          this.dataSource = res.result.records
+                          this.pagination = {
+                            total: res.result.total,
+                            current: res.result.current,
+                            pageSize: res.result.size
+                          }
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
+            },
+            handleTableChange(pagination, filters, sorter) {
+                this.queryParam.pageNo = pagination.current
+                this.queryParam.pageSize = pagination.pageSize
+                this.getData()
+            },
+            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/#sonList1>.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: 8px 8px !important;
+    }
+    /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+        width: calc(100% + 9px);//减去滚动条的宽度
+    }
+  </style>

src/views/production/Popup/deparmentPopup.vue

@@ -0,0 +1,197 @@
+<template>
+    <a-modal
+      title="部门列表"
+       width="60%"
+      :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='sonList1'
+            :columns="columns"
+            rowKey="rowIndex"
+            :dataSource="dataSource"
+            :pagination="pagination"
+            :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: 'deparmentPopup',
+        mixins: [JEditableTableModelMixin],
+        components: {
+        },
+        data() {
+          return {
+            visible:false,
+            selectedRowKeys:[],
+            selectedRows:[],
+            dataSource:[],
+            pagination:{
+                current: 1,
+                pageSize: 5,
+                pageSizeOptions: ['5', '10', '20'],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条"
+                },
+                showQuickJumper: true,
+                showSizeChanger: true,
+                total: 0
+            },
+            queryParam:{
+                pageNo:1
+            },
+            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: 'ID',
+                    align:"center",
+                    dataIndex: 'ID',
+                    ellipsis: true,
+                },
+            ]
+          }
+        },
+        created() {
+          
+        },
+        methods: {
+            handleCancel(){
+                this.visible=false
+                this.dataSource = [] 
+                this.selectedRowKeys = []
+                this.selectedRows = []
+            },
+            handleOk(){
+                if(this.selectedRowKeys.length!==1){
+                    this.$message.warning('请选择一条数据！')
+                }else{
+                    this.$emit('okData',this.selectedRows[0])
+                    this.handleCancel()
+                }
+            },
+            getData(){
+                getAction('/production/safetyStock/selectDepartment',this.queryParam).then(res=>{
+                        if(res.success){
+                          this.dataSource = res.result.records
+                          this.pagination = {
+                            total: res.result.total,
+                            current: res.result.current,
+                            pageSize: res.result.size
+                          }
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
+            },
+            handleTableChange(pagination, filters, sorter) {
+                this.queryParam.pageNo = pagination.current
+                this.queryParam.pageSize = pagination.pageSize
+                this.getData()
+            },
+            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/#sonList1>.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: 8px 8px !important;
+    }
+    /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+        width: calc(100% + 9px);//减去滚动条的宽度
+    }
+  </style>

src/views/production/Popup/inventoryPopup.vue

@@ -14,7 +14,7 @@
             ref="table"
             size="middle"
             bordered
-            id='sonList'
+            id='sonList1'
             :columns="columns"
             rowKey="rowIndex"
             :dataSource="dataSource"
@@ -59,6 +59,7 @@
             queryParam:{
                 pageNo:1
             },
+            record:{},
             columns:[
                 {
                     title: '#',
@@ -110,12 +111,14 @@
             handleCancel(){
                 this.visible=false
                 this.dataSource = [] 
+                this.selectedRowKeys = []
+                this.selectedRows = []
             },
             handleOk(){
                 if(this.selectedRowKeys.length!==1){
                     this.$message.warning('请选择一条数据！')
                 }else{
-                    this.$emit('okData',this.selectedRows[0])
+                    this.$emit('okData',this.selectedRows[0],this.record)
                     this.handleCancel()
                 }
             },
@@ -204,9 +207,9 @@
     /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;
-    // }
+    /deep/#sonList1>.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: 8px 8px !important;
+    }
     /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
         width: calc(100% + 9px);//减去滚动条的宽度
     }

src/views/production/Popup/organizationPopup.vue

@@ -0,0 +1,197 @@
+<template>
+    <a-modal
+      title="组织档案"
+       width="60%"
+      :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='sonList1'
+            :columns="columns"
+            rowKey="rowIndex"
+            :dataSource="dataSource"
+            :pagination="pagination"
+            :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: 'organizationPopup',
+        mixins: [JEditableTableModelMixin],
+        components: {
+        },
+        data() {
+          return {
+            visible:false,
+            selectedRowKeys:[],
+            selectedRows:[],
+            dataSource:[],
+            pagination:{
+                current: 1,
+                pageSize: 5,
+                pageSizeOptions: ['5', '10', '20'],
+                showTotal: (total, range) => {
+                    return range[0] + "-" + range[1] + " 共" + total + "条"
+                },
+                showQuickJumper: true,
+                showSizeChanger: true,
+                total: 0
+            },
+            queryParam:{
+                pageNo:1
+            },
+            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: 'ID',
+                    align:"center",
+                    dataIndex: 'ID',
+                    ellipsis: true,
+                },
+            ]
+          }
+        },
+        created() {
+          
+        },
+        methods: {
+            handleCancel(){
+                this.visible=false
+                this.dataSource = [] 
+                this.selectedRowKeys = []
+                this.selectedRows = []
+            },
+            handleOk(){
+                if(this.selectedRowKeys.length!==1){
+                    this.$message.warning('请选择一条数据！')
+                }else{
+                    this.$emit('okData',this.selectedRows[0])
+                    this.handleCancel()
+                }
+            },
+            getData(){
+                getAction('/production/safetyStock/selectOrganization',this.queryParam).then(res=>{
+                        if(res.success){
+                          this.dataSource = res.result.records
+                          this.pagination = {
+                            total: res.result.total,
+                            current: res.result.current,
+                            pageSize: res.result.size
+                          }
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
+            },
+            handleTableChange(pagination, filters, sorter) {
+                this.queryParam.pageNo = pagination.current
+                this.queryParam.pageSize = pagination.pageSize
+                this.getData()
+            },
+            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/#sonList1>.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: 8px 8px !important;
+    }
+    /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+        width: calc(100% + 9px);//减去滚动条的宽度
+    }
+  </style>

src/views/production/Popup/projectPopup.vue

@@ -14,7 +14,7 @@
             ref="table"
             size="middle"
             bordered
-            id='sonList'
+            id='sonList1'
             :columns="columns"
             rowKey="rowIndex"
             :dataSource="dataSource"
@@ -98,6 +98,8 @@
             handleCancel(){
                 this.visible=false
                 this.dataSource = [] 
+                this.selectedRowKeys = []
+                this.selectedRows = []
             },
             handleOk(){
                 if(this.selectedRowKeys.length!==1){
@@ -110,7 +112,6 @@
             getData(){
                 getAction('/production/safetyStock/selectProject',this.queryParam).then(res=>{
                         if(res.success){
-                            debugger
                           this.dataSource = res.result.records
                           this.pagination = {
                             total: res.result.total,
@@ -193,9 +194,9 @@
     /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;
-    // }
+    /deep/#sonList1>.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: 8px 8px !important;
+    }
     /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
         width: calc(100% + 9px);//减去滚动条的宽度
     }

src/views/production/materialprocurement/materialProcurementList.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.planOrg" @search="onSearch"></a-input-search>
+                <a-input placeholder="请输入" v-model="queryParam.planOrg" ></a-input>
               </a-form-item>
             </a-col>
             <a-col  :md="4" :sm="24">
@@ -36,12 +36,12 @@
             <template v-if="toggleSearchStatus">
               <a-col :md="4" :sm="24">
                 <a-form-item label="业务员">
-                  <a-input-search placeholder="请输入" v-model="queryParam.salesperson" @search="onSearch"></a-input-search>
+                  <a-input placeholder="请输入" v-model="queryParam.salesperson" ></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="计划部门">
-                <a-input-search placeholder="请输入" v-model="queryParam.planDept" @search="onSearch"></a-input-search>
+                <a-input placeholder="请输入" v-model="queryParam.planDept" ></a-input>
               </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -51,7 +51,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="项目">
-                  <a-input-search placeholder="请输入" v-model="queryParam.project" @search="onSearchProject"></a-input-search>
+                  <a-input-search placeholder="请输入" v-model="queryParam.project" ></a-input-search>
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -138,7 +138,6 @@
     </a-card>
     <materialProcurementAdd ref="materialProcurementAdd" @ok='getTableList'></materialProcurementAdd>
     <materialProcurementDetail ref="materialProcurementDetail" ></materialProcurementDetail>
-    <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
 </div>
 </template>
   
@@ -151,7 +150,6 @@
     import materialProcurementAdd from './modules/materialProcurementAdd'
     import materialProcurementDetail from './modules/materialProcurementDetail'
     import alertModal from '../../../plugins/modal'
-    import projectPopup from '../Popup/projectPopup'
     import { Message } from "element-ui";
     //---------workflow  by fhf end -------------
     export default {
@@ -160,7 +158,6 @@
       components: {
         materialProcurementAdd,
         materialProcurementDetail,
-        projectPopup
       },
       data () {
         return {
@@ -579,14 +576,6 @@
          }
         })
       },
-      onSearchProject(){
-        this.$refs.projectPopup.visible = true
-        this.$refs.projectPopup.getData()
-      },
-      okData(data){
-        this.$set(this.queryParam,'projectCode',data.Code)
-        this.$set(this.queryParam,'project',data.Name)
-      },
       //请购单
       synchronizationData(){
         this.$confirm({

src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -14,7 +14,7 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-item label="计划组织">
-                            <a-input-search placeholder="请输入" v-model="form.planOrg" @search="onSearch"></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.planOrg" @search="onSearchPlanOrg" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
@@ -40,22 +40,22 @@
                     </a-col> -->
                     <a-col :md="4" :sm="24">
                         <a-form-item label="项目编码">
-                            <a-input placeholder="请输入" v-model="form.projectCode"></a-input>
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="项目">
-                            <a-input-search placeholder="请输入" v-model="form.project" @search="onSearch"></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.project" @search="onSearchProject" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="计划部门">
-                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearch"></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearchDept" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务员">
-                            <a-input-search placeholder="请输入" v-model="form.salesperson"  @search="onSearch"></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.salesperson"  @search="onSearchPerson" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -115,19 +115,9 @@
                     <a-input placeholder="请输入" v-model="record.batch"></a-input>
                 </a-form-model-item>
             </template>
-            <template slot="projectCode" slot-scope="text, record, index">
-                <a-form-model-item prop="projectCode" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.projectCode"></a-input>
-                </a-form-model-item>
-            </template>
-            <template slot="projectName" slot-scope="text, record, index">
-                <a-form-model-item prop="projectName" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.projectName"></a-input>
-                </a-form-model-item>
-            </template>
             <template slot="inventoryName" slot-scope="text, record, index">
                 <a-form-model-item prop="inventoryName" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.inventoryName"></a-input>
+                    <a-input-search placeholder="请输入" v-model="record.inventoryName" @search="onSearchInventory(record)" readOnly></a-input-search>
                 </a-form-model-item>
             </template> 
             <template slot="inventoryCode" slot-scope="text, record, index">
@@ -326,6 +316,11 @@
             </a-form>
          </div>
     </a-card>
+    <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
+    <inventoryPopup ref="inventoryPopup" @okData="okDataInvent"></inventoryPopup>
+    <deparmentPopup ref="deparmentPopup" @okData="okDataDeparment"></deparmentPopup>
+    <OperatorsPopup ref="OperatorsPopup" @okData="okDataOperators"></OperatorsPopup>
+    <organizationPopup ref="organizationPopup" @okData="okDataOrganization"></organizationPopup>
     </a-modal>
   </template>
   <script>
@@ -334,10 +329,20 @@
       import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+      import projectPopup from '../../Popup/projectPopup'
+      import inventoryPopup from '../../Popup/inventoryPopup.vue'
+      import deparmentPopup from '../../Popup/deparmentPopup.vue'
+      import OperatorsPopup from '../../Popup/OperatorsPopup.vue'
+      import organizationPopup from '../../Popup/organizationPopup.vue'
       export default {
         name: 'materialProcurementAdd',
         mixins: [JEditableTableModelMixin],
         components: {
+            projectPopup,
+            inventoryPopup,
+            deparmentPopup,
+            OperatorsPopup,
+            organizationPopup
         },
         data() {
           return {
@@ -373,14 +378,12 @@
                     align:"center",
                     dataIndex: 'projectCode',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'projectCode' } 
                 },
                 {
                     title: '项目名称',
                     align:"center",
                     dataIndex: 'projectName',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'projectName' } 
                 },
                 {
                     title: '存货名称',
@@ -394,15 +397,12 @@
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'inventoryCode' } 
-
                 },
                 {
                     title: '计量单位',
                     align:"center",
                     dataIndex: 'unit',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'unit' } 
 
                 },
                 {
@@ -426,7 +426,6 @@
                     align:"center",
                     dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'auxiliaryUnit' } 
                 },
                 {
                     title: '辅数量',
@@ -440,7 +439,6 @@
                     align:"center",
                     dataIndex: 'specs',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'specs' } 
                 },
                 {
                     title: '型号',
@@ -667,8 +665,9 @@
             handleTableChange(){
 
             },
-            onSearch(){
-               
+            onSearchPlanOrg(){
+                this.$refs.organizationPopup.visible = true
+                this.$refs.organizationPopup.getData()
             },
             //获取主表信息
             getMainData(id){
@@ -697,7 +696,48 @@
                 })
             },
             addList(){
-                this.dataSource.unshift({rowNo: this.dataSource.length+1})
+                this.dataSource.unshift({rowNo: this.dataSource.length+1,projectCode:this.form.projectCode,projectName:this.form.project})
+            },
+            onSearchProject(){
+                this.$refs.projectPopup.visible = true
+                this.$refs.projectPopup.getData()
+            },
+            onSearchDept(){
+                this.$refs.deparmentPopup.visible = true
+                this.$refs.deparmentPopup.getData()
+            },
+            onSearchPerson(){
+                this.$refs.OperatorsPopup.visible = true
+                this.$refs.OperatorsPopup.getData()
+            },
+            onSearchInventory(record){
+                this.$refs.inventoryPopup.visible = true
+                this.$refs.inventoryPopup.getData()
+                this.$refs.inventoryPopup.record=record
+            },
+            okData(data){
+                this.$set(this.form,'projectCode',data.Code)
+                this.$set(this.form,'project',data.Name)
+                this.dataSource.map(item=>{
+                    item.projectCode = data.Code
+                    item.projectName = data.Name
+                })
+            },
+            okDataInvent(data,recoerd){
+              this.$set(recoerd,'inventoryCode',data.Code)
+              this.$set(recoerd,'inventoryName',data.Name)
+              this.$set(recoerd,'specs',data.SPECS)
+              this.$set(recoerd,'unit',data.unit)
+              this.$set(recoerd,'auxiliaryUnit',data.auxiliaryUnit )
+            },
+            okDataDeparment(data){
+                this.$set(this.form,'planDept',data.Name)
+            },
+            okDataOperators(data){
+                this.$set(this.form,'salesperson',data.Name)
+            },
+            okDataOrganization(data){
+                this.$set(this.form,'planOrg',data.Name)
             },
             delectRow(){
                 if( this.selectedRowKeys.length==0){

src/views/production/safetyStock/modules/safetyStockListAdd.vue

@@ -44,7 +44,7 @@
                   </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-item label="规格" prop='model'>
-                      <a-input placeholder="请输入" v-model="form.specs"></a-input>
+                      <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
@@ -69,12 +69,12 @@
                   </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-item label="辅单位" prop='auxiliaryUnit'>
-                      <a-input placeholder="请输入" v-model="form.auxiliaryUnit"></a-input>
+                      <a-input placeholder="请输入" v-model="form.auxiliaryUnit" disabled></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-item label="单位" prop='unit'>
-                        <a-input placeholder="请输入" v-model="form.unit"></a-input>
+                        <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="8" :sm="24">

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="onSearchInvebtory"></a-input-search>
+                    <a-input placeholder="请输入" v-model="queryParam.inventoryCode" ></a-input>
                   </a-form-item>
                 </a-col>
                 <a-col  :md="4" :sm="24">
@@ -18,23 +18,23 @@
                 </a-col>
                 <a-col :md="4" :sm="24">
                     <a-form-item label="颜色">
-                        <a-input-search placeholder="请输入" v-model="queryParam.color" @search="onSearch"></a-input-search>
+                        <a-input placeholder="请输入" v-model="queryParam.color" ></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="4" :sm="24">
                     <a-form-item label="定尺">
-                        <a-input-search placeholder="请输入" v-model="queryParam.fixedLength" @search="onSearch"></a-input-search>
+                        <a-input placeholder="请输入" v-model="queryParam.fixedLength" ></a-input>
                     </a-form-item>
                   </a-col>
                 <template v-if="toggleSearchStatus">
                   <a-col :md="4" :sm="24">
                     <a-form-item label="合金">
-                      <a-input-search placeholder="请输入" v-model="queryParam.alloy" @search="onSearch"></a-input-search>
+                      <a-input placeholder="请输入" v-model="queryParam.alloy" ></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="4" :sm="24">
                     <a-form-item label="标准">
-                    <a-input-search placeholder="请输入" v-model="queryParam.standard" @search="onSearch"></a-input-search>
+                    <a-input placeholder="请输入" v-model="queryParam.standard" ></a-input>
                   </a-form-item>
                   </a-col>
                   <a-col :md="4" :sm="24">
@@ -44,7 +44,7 @@
                   </a-col>
                   <a-col :md="4" :sm="24">
                     <a-form-item label="型号">
-                      <a-input-search placeholder="请输入" v-model="queryParam.model" @search="onSearch"></a-input-search>
+                      <a-input placeholder="请输入" v-model="queryParam.model" ></a-input>
                     </a-form-item>
                   </a-col>
                   <a-col :md="4" :sm="24">
@@ -153,7 +153,6 @@
         </a-card>
         <safetyStockListAdd ref="safetyStockListAdd" @ok='getTableList'></safetyStockListAdd>
         <safetyStockListDetail ref="safetyStockListDetail"></safetyStockListDetail>
-        <inventoryPopup ref="inventoryPopup" @okData="okData"></inventoryPopup>
     </div>
     </template>
       
@@ -165,7 +164,6 @@
         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",
@@ -173,7 +171,6 @@
           components: {
             safetyStockListAdd,
             safetyStockListDetail,
-            inventoryPopup
           },
           data () {
             return {
@@ -492,16 +489,6 @@
                 this.$refs.safetyStockListDetail.getEditData(this.selectedRowKeys[0])
               }
             },
-            okData(data){
-              this.$set(this.queryParam,'inventoryCode',data.Code)
-              this.$set(this.queryParam,'inventoryName',data.Name)
-              this.$set(this.queryParam,'unit',data.unit)
-              this.$set(this.queryParam,'auxiliaryUnit',data.auxiliaryUnit)
-            },
-            onSearchInvebtory(){
-              this.$refs.inventoryPopup.visible = true
-              this.$refs.inventoryPopup.getData()
-            },
             //双击
             clickRow(record, index){
               return {