yuansh vor 11 Monaten
Ursprung
Commit
26cc97cf88

+ 14 - 14
src/views/production/materialprocurement/modules/materialProcurementAdd.vue

@@ -14,12 +14,12 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="生产组织" prop='orgName'>
-                            <a-input-search placeholder="请输入" v-model="form.orgName" @search="onSearchPlanOrg" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.orgName" @search="onSearchPlanOrg" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
                         <a-form-model-item label="单据号">
-                            <a-input placeholder="请输入" v-model="form.orderCode"></a-input>
+                            <a-input placeholder="自动生成" v-model="form.orderCode" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -39,25 +39,25 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="业务员">
-                            <a-input-search placeholder="请输入" v-model="form.salesperson"  @search="onSearchPerson" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.salesperson"  @search="onSearchPerson" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="计划部门">
-                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearchDept" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.planDept" @search="onSearchDept" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
+                  
                     <a-col :md="4" :sm="24">
-                        <a-form-model-item label="项目编码" prop='projectCode'>
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
+                        <a-form-model-item label="项目名称" prop='projectName'>
+                            <a-input-search placeholder="请选择" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-model-item label="项目名称" prop='projectName'>
-                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
+                        <a-form-model-item label="项目编码" prop='projectCode'>
+                            <a-input placeholder="请选择" v-model="form.projectCode" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
-                    
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="业务类型" prop='type'>
                             <a-select v-model="form.type"  style='width:100%' >
@@ -68,12 +68,12 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="制单人">
-                            <a-input placeholder="请输入" v-model="form.createBy" disabled></a-input>
+                            <a-input placeholder="自动" v-model="form.createBy" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="审批人">
-                            <a-input placeholder="请输入" v-model="form.reviewer" disabled></a-input>
+                            <a-input placeholder="自动" v-model="form.reviewer" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     
@@ -118,7 +118,7 @@
             </template>
             <template slot="inventoryName" slot-scope="text, record, index">
                 <a-form-model-item prop="inventoryName" class='sonItem'>
-                    <a-input-search placeholder="请输入" v-model="record.inventoryName" @search="onSearchInventory(record)" readOnly></a-input-search>
+                    <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">
@@ -203,7 +203,7 @@
             </template>
             <template slot="windowNo" slot-scope="text, record, index">
                 <a-form-model-item prop="windowNo" class='sonItem'>
-                    <a-input placeholder="请输入" v-model="record.stanwindowNodard"></a-input>
+                    <a-input placeholder="请输入" v-model="record.windowNo"></a-input>
                 </a-form-model-item>
             </template>
             <template slot="exclusiveZone" slot-scope="text, record, index">
@@ -310,7 +310,7 @@
         data() {
           return {
             visible:false,
-            form:{},
+            form:{state:"开立"},
             defaultMethod:'add',
             formTable:{
                 dataSource:[],

+ 8 - 6
src/views/production/materialprocurement/modules/materialProcurementDetail.vue

@@ -49,14 +49,15 @@
                             <a-input-search placeholder="请输入" v-model="form.planDept" disabled></a-input-search>
                         </a-form-item>
                     </a-col>
+                   
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="项目编码">
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
+                        <a-form-item label="项目名称">
+                            <a-input-search placeholder="请输入" v-model="form.projectName" disabled></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.projectName" disabled></a-input-search>
+                        <a-form-item label="项目编码">
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -98,10 +99,11 @@
           :dataSource="dataSource"
           :pagination="false"
           :scroll="{ x: 4500, y: 300 }"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          
           >
+          <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
         </a-table>
-       </a-form-model">
+       </a-form-model>
     </a-card>
     </a-modal>
   </template>

+ 8 - 8
src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue

@@ -18,12 +18,12 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="生产组织" prop='orgName' >
-                            <a-input-search placeholder="请输入" v-model="form.orgName"  @search="onSearchProductionOrg" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.orgName"  @search="onSearchProductionOrg" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
                         <a-form-model-item label="单据号">
-                            <a-input placeholder="请输入" v-model="form.orderCode" disabled></a-input>
+                            <a-input placeholder="自动生成" v-model="form.orderCode" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -38,22 +38,22 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="业务员">
-                            <a-input-search placeholder="请输入" v-model="form.salesperson" @search="onSearchPerson" readOnly ></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.salesperson" @search="onSearchPerson" readOnly ></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="计划部门">
-                            <a-input-search placeholder="请输入" v-model="form.planDept" @search="onSearchPlanDept" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.planDept" @search="onSearchPlanDept" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="项目名称" prop='projectName'>
-                            <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
+                            <a-input-search placeholder="请选择" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="项目编码" prop='projectCode'>
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
+                            <a-input placeholder="请选择" v-model="form.projectCode" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -66,12 +66,12 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="制单人">
-                            <a-input placeholder="请输入" v-model="form.createBy"  disabled></a-input>
+                            <a-input placeholder="自动" v-model="form.createBy"  disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-model-item label="审核人">
-                            <a-input placeholder="请输入" v-model="form.reviewer" disabled></a-input>
+                            <a-input placeholder="自动" v-model="form.reviewer" disabled></a-input>
                         </a-form-model-item>
                     </a-col>
                     <a-col :md="4" :sm="24">

+ 6 - 0
src/views/production/safetyStock/encoderList.vue

@@ -287,11 +287,17 @@
             },
             //编辑
             editList(){
+              
+              if(this.selectedRow[0].sync == '是'){
+                this.$message.warning('已同步的数据无法修改!')
+                return;
+              }
               if(this.selectedRowKeys.length==0){
                 this.$message.warning('请勾选数据!')
               }else if(this.selectedRowKeys.length>1){
                 this.$message.warning('只可勾选一条数据')
               }else{
+                
                 this.$refs.AddEncoder.visible=true
                 this.$refs.AddEncoder.defaultMethod='edit'
                 this.$refs.AddEncoder.getEditData(this.selectedRowKeys[0])