fix: 1.生产工单细节优化; 2.领料申请细节优化

src/components/request/requestItem.vue

@@ -85,7 +85,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="产品名称" prop="itemName">
-              <el-input v-model="form.itemName" placeholder="请输入产品名称" />
+              <el-input v-model="form.itemName" type="textarea" placeholder="请输入产品名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -97,12 +97,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="工作中心" prop="workstationCode">
-              <el-input v-model="form.workstationCode" placeholder="请输入工作中心" />
+              <el-input v-model="form.workstationCode" placeholder="请输入工作中心编码" />
+              <el-input v-model="form.workstationName" type="textarea" placeholder="请输入工作中心名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="工作单元" prop="workunitCode">
-              <el-input v-model="form.workunitCode" placeholder="请输入工作单元" />
+              <el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" />
+              <el-input v-model="form.workunitName" type="textarea" placeholder="请输入工作单元名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -292,7 +294,7 @@
         this.optType = "view";
       });
     },
-     
+
 
            // 取消按钮
     cancels() {
@@ -345,7 +347,7 @@ this.form = {
 
 this.resetForm("form");
 },
-      
+
       //确定选中
       confirmSelect(){
           if(this.selectedTaskId ==null || this.selectedTaskId==0){

src/views/mes/pro/secretSend/index.vue

 <template>
     <div class="app-container">
         <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-            
+
             <el-form-item label="生产工单" prop="workorderCode">
                 <el-input
                 v-model="queryParams.workorderCode"
@@ -34,7 +34,7 @@
                 @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            
+
             <el-form-item label="状态" prop="statusList">
                 <el-select v-model="queryParams.statusList" multiple placeholder="请选择状态" clearable>
                     <el-option
@@ -105,7 +105,7 @@
         />
         <!-- 添加领料申请对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" 
+            <el-form ref="form" :model="form" :rules="rules"
                 label-width="100px">
                 <el-row>
                     <el-col :span="12">
@@ -113,14 +113,14 @@
                             <el-input v-model="form.applyNo" placeholder="请输入申请号" disabled />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <!-- <el-col :span="12">
                         <el-form-item label="工作中心" prop="workstationCode">
                             <el-input v-model="form.workstationCode" placeholder="工作中心">
                                 <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"
                                     :disabled="form.workstationMaterialId"></el-button>
                             </el-input>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
                 <el-row>
                     <el-col :span="12">
@@ -136,7 +136,7 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    <WorkstationSelect ref="workstationSelect" 
+                    <WorkstationSelect ref="workstationSelect"
                         @onSelected="onWorkstationSelect"></WorkstationSelect>
                 </el-row>
 
@@ -155,7 +155,7 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    
+
                 </el-row>
             </el-form>
             <el-divider content-position="center">申请单物料</el-divider>
@@ -388,4 +388,4 @@ export default {
         },
     }
 }
-</script>
+</script>
\ No newline at end of file

src/views/mes/pro/workorder/indexApply.vue

@@ -20,8 +20,11 @@
         <el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="来源单据" prop="sourceCode">
+      <!-- <el-form-item label="来源单据" prop="sourceCode">
         <el-input v-model="queryParams.sourceCode" placeholder="请输入来源单据" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item> -->
+      <el-form-item label="订单编号" prop="salesVoucher">
+        <el-input v-model="queryParams.salesVoucher" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="产品名称" prop="productName">
         <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
@@ -730,6 +733,7 @@ export default {
         orderSource: null,
         sapItemCode: null,
         // sourceCode: null,
+        salesVoucher: null,
         productId: null,
         productCode: null,
         productName: null,

src/views/mes/pro/workstationRequest/index.vue

@@ -33,10 +33,10 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                     v-hasPermi="['pro:material:add']">新增</el-button>
-            </el-col>
+            </el-col> -->
             <!-- <el-col :span="1.5">
                 <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
                     v-hasPermi="['pro:material:edit']">修改</el-button>
@@ -57,14 +57,14 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="产品编码" align="center" width="150" prop="sapItemCode" />
             <el-table-column label="产品名称" align="center" width="150" prop="itemName" />
-            <el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" />
+            <!-- <el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" /> -->
             <el-table-column label="申请单号" align="center" width="150" prop="applyNo" />
             <el-table-column label="工单号" align="center" width="150" prop="workorderCode" />
-            <el-table-column label="领料类型" align="center" width="150" prop="applyType">
+            <!-- <el-table-column label="领料类型" align="center" width="150" prop="applyType">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType" />
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="申请数量" align="center" width="150" prop="applyNum" />
             <el-table-column label="是否结案" align="center" prop="windCase">
                 <template slot-scope="scope">
@@ -158,14 +158,14 @@
                     <el-col :span="12">
                         <el-form-item label="工单号" prop="workorderCode">
                             <el-input v-model="form.workorderCode" placeholder="请选任务单号" readonly="readonly">
-                                <el-button slot="append" icon="el-icon-search" 
+                                <el-button slot="append" icon="el-icon-search"
                                     :disabled="form.materialRequestId"></el-button>
                             </el-input>
                         </el-form-item>
                     </el-col>
-                    <WorkstationSelect ref="workstationSelect" 
+                    <WorkstationSelect ref="workstationSelect"
                         @onSelected=" onWorkstationSelect"></WorkstationSelect>
-                 
+
                     <!-- <el-col :span="8">
                         <el-form-item label="工作单元" prop="workunitCode">
                             <el-input v-model="form.workunitCode" placeholder="工作单元">
@@ -188,7 +188,7 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                   
+
                     <el-col :span="12">
                         <el-form-item label="需求日期" prop="startTime">
                             <el-date-picker clearable v-model="form.startTime" type="datetime"
@@ -204,7 +204,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                
+
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
@@ -246,12 +246,12 @@
                             <el-input v-model="form.workstationName" placeholder="请输入工作中心名称" disabled />
                         </el-form-item>
                     </el-col>
-                    
-                    <WorkstationSelect ref="workstationSelect" 
+
+                    <WorkstationSelect ref="workstationSelect"
                         @onSelected="onWorkstationSelect"></WorkstationSelect>
                 </el-row>
 
-                <workorderSelect ref="workorderselect" key="workorderselect" 
+                <workorderSelect ref="workorderselect" key="workorderselect"
                     @onSelected="onWorkorderSelect">
                 </workorderSelect>
 
@@ -277,7 +277,7 @@
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
-                    
+
                 </el-row>
             </el-form>
             <el-divider content-position="center">申请单物料</el-divider>
@@ -379,7 +379,7 @@ export default {
     },
     methods: {
 
-       
+
         handleItemSelect() {
             this.$refs.ItemSelect.showFlag = true;
         },
@@ -397,13 +397,13 @@ export default {
         },
         onWorkstationSelect(row) {
             if (row != undefined && row != null) {
-               
+
                     // this.form.workunitName = row.workunitName
                     this.$set(this.form, 'workunitCode', row.workunitCode)
                     this.form.workstationId = row.workstationId;
                     this.form.workstationCode = row.workstationCode;
                     this.form.workstationName = row.workstationName;
-                
+
             }
 
         },
@@ -603,4 +603,4 @@ export default {
         }
     }
 };
-</script>
+</script>
\ No newline at end of file