Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/mrp/modules/operation.vue

@@ -1,221 +1,207 @@
-<template>
-    <a-modal
-      title="MRP运算"
-       width="35%"
-      :visible="visible"
-      :maskClosable="false"
-      destroyOnClose
-      switchFullscreen
-      @cancel="handleCancel"
-      @ok='handleOk'
-      >
-      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
-        <div class="table-page-search-wrapper">
-            <a-form-model layout="inline" :model="form" :rules="rules"  ref="form">
-                <a-row :gutter="24">
-                    <a-col :md="24" :sm="24">
-                        <a-form-model-item label="组织" prop="pkOrg">
-                            <a-select v-model="form.pkOrg"  style='width:100%' @change="changePkorg">
-                                <a-select-option v-for="(item,index) in optionOrg" :key="index" :value="item.ID">{{ item.Name }}</a-select-option>
-                            </a-select>
-                        </a-form-model-item>
-                    </a-col>
-                    <a-col :md="24" :sm="24">
-                        <a-form-model-item label="业务类型" prop="type">
-                            <a-select v-model="form.type"  style='width:100%'>
-                                <a-select-option value='mrp'>mrp</a-select-option>
-                                <a-select-option value='安全库存'>安全库存</a-select-option>
-                            </a-select>
-                        </a-form-model-item>
-                    </a-col>
-                    <a-col  :md="24" :sm="24">
-                        <a-form-model-item label="项目名称" prop="projectName" v-if="form.type=='mrp'">
-                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
-                        </a-form-model-item>
-                    </a-col>
-                    <a-col :md="24" :sm="24">
-                        <a-form-model-item label="工单号" prop="workNo" v-if="form.type=='mrp'">
-                            <a-input placeholder="请输入" v-model="form.workNo"></a-input>
-                        </a-form-model-item>
-                    </a-col>   
-                </a-row>
-            </a-form-model>
-        </div>
-     </a-card>
-     <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
-    </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'
-      import projectPopup from '../../Popup/projectPopup'
-      export default {
-        name: 'operation',
-        mixins: [JEditableTableModelMixin],
-        components: {
-            projectPopup,
-        },
-        data() {
-          return {
-            visible:false,
-            form:{},
-            form1:{},
-            loading:false,
-            rules:{
-                pkOrg:[
-                    { required: true, trigger: 'change' },
-                ],
-                type: [
-                    { required: true, trigger: 'change' },
-                ],
-                projectName: [
-                    { required: true, trigger: 'change' },
-                ],
-                workNo: [
-                    { required: true, trigger: 'change' },
-                ],
-                inventoryType: [
-                    { required: false, trigger: 'change' },
-                ],
-            },
-            // ipagination:{},
-            selectedRowKeys:[],
-            selectedRows:[],
-            optionOrg:[]
-          }
-        },
-        created() {
-          this.getOption()
-        },
-        methods: {
-            handleCancel(){
-                this.visible=false
-                this.defaultMethod='add'
-                this.dataSource = [] 
-                this.form={}
-                this.form1={}
-            },
-            handleOk(){
-                this.$refs.form.validate(success => {
-	              if (success) {
-                    getAction('/MRPOperationList/madeOperationList/operationSafe',this.form).then(res=>{
-                        if(res.success){
-                          this.handleCancel()
-                          this.$emit('ok')
-                        }else{
-                          this.$message.error(res.message);
-                          
-                        }
-                    })
-                  }
-                })
-            },
-            onSearch(){
-               
-            },
-            getOption(){
-                getAction('/production/safetyStock/selectOrganization').then(res=>{
-                        if(res.success){
-                          this.optionOrg = res.result.records
-                        }else{
-                          this.$message.error(res.message);
-                          
-                        }
-                })
-            },
-            changePkorg(){
-                this.$set(this.form,'projectName','')
-                this.$set(this.form,'project','')
-            },
-            onSearchProject(){
-                if(this.form.pkOrg==''||!this.form.pkOrg){
-                    this.$message.error('请先选择组织！');
-                }else{
-                    this.$refs.projectPopup.visible = true
-                    this.$refs.projectPopup.getData(this.form.pkOrg)
-                }
-            },
-            okData(data){
-                this.$set(this.form,'projectName',data.Name)
-                this.$set(this.form,'project',data.ID)
-            },
-            changeType(prop){
-                if(prop=='安全库存'){
-                    this.rules.projectName[0].required = false
-                    this.rules.workNo[0].required = false
-                }else{
-                    this.rules.projectName[0].required = true
-                    this.rules.workNo[0].required = true
-                }
-            }
-        }
-      }
-  </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:0px;
-        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;
-    }
-    // 表单校验隐藏提示文字
-    /deep/.ant-form-explain{
-      display:none
-    }
+<template>
+    <a-modal
+      title="MRP运算"
+       width="35%"
+      :visible="visible"
+      :maskClosable="false"
+      destroyOnClose
+      switchFullscreen
+      @cancel="handleCancel"
+      @ok='handleOk'
+      >
+      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
+        <div class="table-page-search-wrapper">
+            <a-form-model layout="inline" :model="form" :rules="rules"  ref="form">
+                <a-row :gutter="24">
+                    <a-col :md="24" :sm="24">
+                        <a-form-model-item label="组织" prop="pkOrg">
+                            <a-select v-model="form.pkOrg"  style='width:100%' @change="changePkorg">
+                                <a-select-option v-for="(item,index) in optionOrg" :key="index" :value="item.ID">{{ item.Name }}</a-select-option>
+                            </a-select>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col :md="24" :sm="24">
+                        <a-form-model-item label="业务类型" prop="type">
+                            <a-select v-model="form.type"  style='width:100%'>
+                                <a-select-option value='mrp'>mrp</a-select-option>
+                                <a-select-option value='安全库存'>安全库存</a-select-option>
+                            </a-select>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col  :md="24" :sm="24">
+                        <a-form-model-item label="项目名称" prop="projectName" v-if="form.type=='mrp'">
+                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
+                        </a-form-model-item>
+                    </a-col>
+                    <a-col :md="24" :sm="24">
+                        <a-form-model-item label="工单号" prop="workNo" v-if="form.type=='mrp'">
+                            <a-input placeholder="请输入" v-model="form.workNo"></a-input>
+                        </a-form-model-item>
+                    </a-col>   
+                </a-row>
+            </a-form-model>
+        </div>
+     </a-card>
+     <projectPopup ref="projectPopup" @okData="okData"></projectPopup>
+    </a-modal>
+  </template>
+  <script>
+      import alertModal from '../../../../plugins/modal'
+      import { FormTypes } from '@/utils/JEditableTableUtil'
+      import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
+      import moment from "moment"
+      import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+      import projectPopup from '../../Popup/projectPopup'
+      export default {
+        name: 'operation',
+        mixins: [JEditableTableModelMixin],
+        components: {
+            projectPopup,
+        },
+        data() {
+          return {
+            visible:false,
+            form:{},
+            form1:{},
+            loading:false,
+            rules:{
+                pkOrg:[
+                    { required: true, trigger: 'change' },
+                ],
+                type: [
+                    { required: true, trigger: 'change' },
+                ],
+                projectName: [
+                    { required: true, trigger: 'change' },
+                ],
+                workNo: [
+                    { required: true, trigger: 'change' },
+                ],
+                inventoryType: [
+                    { required: false, trigger: 'change' },
+                ],
+            },
+            // ipagination:{},
+            selectedRowKeys:[],
+            selectedRows:[],
+            optionOrg:[]
+          }
+        },
+        created() {
+          this.getOption()
+        },
+        methods: {
+            handleCancel(){
+                this.visible=false
+                this.defaultMethod='add'
+                this.dataSource = [] 
+                this.form={}
+                this.form1={}
+            },
+            handleOk(){
                alertModal.loading("执行中，请稍后！！！")
                this.$refs.form.validate(success => {
	              if (success) {
                    getAction('/MRPOperationList/madeOperationList/operationSafe',this.form).then(res=>{
                         alertModal.closeLoading();
                        if(res.success){
                          this.$message.success("执行成功！！");
                          this.handleCancel()
                          this.$emit('ok')
                        }else{
                          this.$message.error(res.message);
                          this.handleCancel()
                        }
                    })
                  }
                })
            },
+            onSearch(){
+               
+            },
+            getOption(){
+                getAction('/production/safetyStock/selectOrganization').then(res=>{
+                        if(res.success){
+                          this.optionOrg = res.result.records
+                        }else{
+                          this.$message.error(res.message);
+                          
+                        }
+                })
+            },
+            changePkorg(){
+                this.$set(this.form,'projectName','')
+                this.$set(this.form,'project','')
+            },
+            onSearchProject(){
+                if(this.form.pkOrg==''||!this.form.pkOrg){
+                    this.$message.error('请先选择组织！');
+                }else{
+                    this.$refs.projectPopup.visible = true
+                    this.$refs.projectPopup.getData(this.form.pkOrg)
+                }
+            },
+            okData(data){
+                this.$set(this.form,'projectName',data.Name)
+                this.$set(this.form,'project',data.ID)
+            },
+            changeType(prop){
+                if(prop=='安全库存'){
+                    this.rules.projectName[0].required = false
+                    this.rules.workNo[0].required = false
+                }else{
+                    this.rules.projectName[0].required = true
+                    this.rules.workNo[0].required = true
+                }
+            }
+        }
+      }
+  </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:0px;
+        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;
+    }
+    // 表单校验隐藏提示文字
+    /deep/.ant-form-explain{
+      display:none
+    }
   </style>

src/views/production/mrp/mrp.vue

@@ -78,11 +78,11 @@
                       <a-input placeholder="请输入" v-model="queryParam.reviewer"></a-input>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="4" :sm="24">
+                 <!-- <a-col :md="4" :sm="24">
                     <a-form-item label="最后修改人">
                       <a-input placeholder="请输入" v-model="queryParam.updateBy"></a-input>
                     </a-form-item>
-                  </a-col>
+                  </a-col> -->
                   
                 </template>
                 <a-col  :md="4" :sm="24">
@@ -278,16 +278,16 @@
                 },
                 
                 {
-                  title: '最后修改人',
+                  title: '创建人',
                   align:"center",
-                  dataIndex: 'updateBy',
+                  dataIndex: 'createBy',
                   ellipsis: true,
     
                 },
                 {
-                  title: '最后修改时间',
+                  title: '创建时间',
                   align:"center",
-                  dataIndex: 'updateTime',
+                  dataIndex: 'createTime',
                   ellipsis: true,
                 },
               ],

src/views/production/productionTotalOrder/productionTotalOrderList.vue

@@ -258,49 +258,51 @@
                   dataIndex: 'projectName',
                   ellipsis: true,
     
-                },
+                }, 
                 {
-                  title: '备注',
-                  align:"center",
-                  dataIndex: 'remarks',
-                  ellipsis: true,
-    
-                },
-                {
-                  title: '业务类型',
+                  title: '项目编码',
                   align:"center",
-                  dataIndex: 'type',
+                  dataIndex: 'projectCode',
                   ellipsis: true,
     
                 },
                 {
-                  title: '制单人',
+                  title: '工单号',
                   align:"center",
-                  dataIndex: 'createBy',
+                  dataIndex: 'workNo',
                   ellipsis: true,
-    
+                    
                 },
                 {
-                  title: '审核人',
+                  title: '业务类型',
                   align:"center",
-                  dataIndex: 'reviewer',
+                  dataIndex: 'type',
                   ellipsis: true,
-    
+                    
                 },
                 {
-                  title: '工单号',
+                  title: '备注',
                   align:"center",
-                  dataIndex: 'workNo',
+                  dataIndex: 'remarks',
                   ellipsis: true,
     
                 },
+                
                 {
-                  title: '项目编码',
+                  title: '审核人',
                   align:"center",
-                  dataIndex: 'projectCode',
+                  dataIndex: 'reviewer',
                   ellipsis: true,
     
                 },
+                
+               {
+                 title: '制单人',
+                 align:"center",
+                 dataIndex: 'createBy',
+                 ellipsis: true,
+                   
+               },
                 // {
                 //   title: '来源标识',
                 //   align:"center",
@@ -313,12 +315,12 @@
                 //   dataIndex: 'version',
                 //   ellipsis: true,
                 // },
-                // {
-                //   title: '制单时间',
-                //   align:"center",
-                //   dataIndex: 'createTime',
-                //   ellipsis: true,
-                // },
+                {
+                  title: '制单时间',
+                  align:"center",
+                  dataIndex: 'createTime',
+                  ellipsis: true,
+                },
               ],
               fileUpload: window._CONFIG['domianURL'] + "/productionOrder/madeProductionOrders/importExcel",
                  // ---------workflow  by fhf start -------------

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

@@ -24,51 +24,52 @@
                 </a-col>
                 <a-col :md="8" :sm="24">
                   <a-form-model-item label="料品编码"  prop='inventoryCode' >
-                    <a-input-search placeholder="请输入" v-model="form.inventoryCode" @search="onSearchInvebtory" readOnly></a-input-search>
+                    <a-input-search placeholder="请选择" v-model="form.inventoryCode" @search="onSearchInvebtory" readOnly></a-input-search>
                   </a-form-model-item>
                 </a-col>
                 <a-col  :md="8" :sm="24">
                   <a-form-model-item label="料品名称" name='inventoryName'  :labelCol="{offset: 1}">
-                    <a-input placeholder="请输入" v-model="form.inventoryName" disabled ></a-input>
+                    <a-input placeholder="" v-model="form.inventoryName" disabled ></a-input>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
                     <a-form-model-item label="型号" name='model' :labelCol="{offset: 3}">
-                      <a-input placeholder="请输入" v-model="form.model" disabled></a-input>
+                      <a-input placeholder="" v-model="form.model" disabled></a-input>
                     </a-form-model-item>
                   </a-col>
                
                 
                 <a-col :md="8" :sm="24">
                     <a-form-model-item label="料品规格" name='model' :labelCol="{offset: 1}">
-                      <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
+                      <a-input placeholder="" v-model="form.specs" disabled></a-input>
                     </a-form-model-item>
                   </a-col>
                   
                   
                   <a-col :md="8" :sm="24" >
                     <a-form-model-item label="料品属性" name='fixedLength' :labelCol="{offset: 1}">
-                        <a-input placeholder="请输入" v-model="form.attribute" disabled />
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-model-item label="安全库存" name='safetyStock'  :labelCol="{offset: 1}">
-                      <a-input-number  :default-value="0"  v-model="form.safetyStock"/>
+                        <a-input placeholder="" v-model="form.attribute" disabled />
                     </a-form-model-item>
                   </a-col>
+                 
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="主单位" name='unit'  :labelCol="{offset: 2}">
-                      <a-input placeholder="请输入" v-model="form.unit" disabled />
+                      <a-input placeholder="" v-model="form.unit" disabled />
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="辅单位" name='auxiliaryUnit'  :labelCol="{offset: 2}">
-                      <a-input placeholder="请输入" v-model="form.auxiliaryUnit" disabled />
+                      <a-input placeholder="" v-model="form.auxiliaryUnit" disabled />
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="换算率" name='rate'  :labelCol="{offset: 2}">
-                      <a-input placeholder="请输入" v-model="form.rate" disabled />
+                      <a-input placeholder="" v-model="form.rate" disabled />
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="8" :sm="24">
+                    <a-form-model-item label="安全库存" name='safetyStock' prop='safetyStock'  :labelCol="{offset: 1}">
+                      <a-input-number   v-model="form.safetyStock"/>
                     </a-form-model-item>
                   </a-col>
               </a-row>