领料单页面和车间信息的页面

src/views/mes/md/workshop/index.vue

@@ -116,6 +116,21 @@
               <el-input v-model="form.workshopCode" placeholder="请输入车间编码" readonly="readonly"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="工厂编码" prop="factoryCode">
+              <el-input v-model="form.factoryCode" placeholder="请输选择工厂编码" >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handlefcatorySelect"
+                ></el-button>
+          </el-input>
+             <fcatorySelect
+              ref="fcatorySelect"
+              @onSelected="onfcatorySelected"
+            ></fcatorySelect>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -174,8 +189,10 @@
 <script>
 import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/mes/md/workshop";
 import {genCode} from "@/api/system/autocode/rule"
+import fcatorySelect from "@/components/FactorySelect/index.vue";
 export default {
   name: "Workshop",
+  components: {fcatorySelect},
   dicts: ['sys_yes_no'],
   data() {
     return {
@@ -238,6 +255,15 @@ export default {
         this.loading = false;
       });
     },
+    handlefcatorySelect(){
+      this.$refs.fcatorySelect.showFlag = true;
+    },
+    onfcatorySelected(row){
+      if(row != undefined && row != null){
+        this.form.factoryId = row.factoryId;
+        this.form.factoryCode = row.factoryCode;
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -252,6 +278,8 @@ export default {
         area: null,
         charge: null,
         enableFlag: 'Y',
+        factoryId: null,
+        factoryCode: null,
         remark: null,
         attr1: null,
         attr2: null,
@@ -281,6 +309,7 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+  
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

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

@@ -121,7 +121,7 @@
 
     <el-table v-loading="loading" :data="materialReturnList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="100" align="center" />
-      <el-table-column label="产品编码" align="center" prop="itemCode" width="150"/>
+      <el-table-column label="产品编码" align="center" prop="sapItemCode" width="150"/>
       <el-table-column label="产品名称" align="center" prop="itemName" width="150"/>
       <el-table-column label="申请单编码" align="center" prop="applyNo" width="150"/>
       <el-table-column label="工作单元编码" align="center" prop="workunitCode" width="150"/>
@@ -189,8 +189,8 @@
       <el-form ref="form" :model="form" :disabled="form.materialReturnId&&optType!='edit'" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-        <el-form-item label="产品编码" prop="itemCode">
-          <el-input v-model="form.itemCode" placeholder="请输入产品编码" />
+        <el-form-item label="产品编码" prop="sapItemCode">
+          <el-input v-model="form.sapItemCode" placeholder="请输入产品编码" />
         </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/mes/wm/issue/index.vue

@@ -9,31 +9,26 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="领料单名称" prop="issueName">
-        <el-input
-          v-model="queryParams.issueName"
-          placeholder="请输入领料单名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库名称" prop="warehouseName">
+   
+      <el-form-item label="生产工单" prop="workorderCode">
         <el-input
-          v-model="queryParams.warehouseName"
+          v-model="queryParams.workorderCode"
           placeholder="请输入仓库名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="领料日期" prop="issueDate">
-        <el-date-picker clearable
-          v-model="queryParams.issueDate"
-          type="date"
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangePurchaseDate"
           value-format="yyyy-MM-dd"
-          placeholder="请选择领料日期">
-        </el-date-picker>
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
       </el-form-item>
-      <el-form-item label="单据状态" prop="status">
+      <!-- <el-form-item label="单据状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
           <el-option
             v-for="dict in dict.type.mes_order_status"
@@ -42,7 +37,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -106,7 +101,7 @@
           >{{scope.row.issueCode}}</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>    
+
       <el-table-column label="生产工单" align="center" prop="workorderCode" />     
       <el-table-column label="申请单号" align="center" prop="applyNo" /> 
       <el-table-column label="创建人" align="center" prop="createBy" />   
@@ -177,13 +172,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="领料单名称" prop="issueName">
-              <el-input v-model="form.issueName" placeholder="请输入领料单名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
             <el-form-item label="领料日期" prop="issueDate">
               <el-date-picker clearable
                 v-model="form.issueDate"
@@ -193,7 +181,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="生产工单" prop="workorderCode">
               <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
                 <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
@@ -201,7 +191,7 @@
             </el-form-item>
             <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="申请单号" prop="applyNo">
               <el-input v-model="form.applyNo" placeholder="请输入申请单" />
             </el-form-item>
@@ -264,6 +254,8 @@ export default {
       total: 0,
       // 生产领料单头表格数据
       issueheaderList: [],
+      
+      daterangePurchaseDate: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -319,6 +311,11 @@ export default {
     /** 查询生产领料单头列表 */
     getList() {
       this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangePurchaseDate && '' != this.daterangePurchaseDate) {
+        this.queryParams.params["beginPurchaseDate"] = this.daterangePurchaseDate[0];
+        this.queryParams.params["endPurchaseDate"] = this.daterangePurchaseDate[1];
+      }
       listIssueheader(this.queryParams).then(response => {
         this.issueheaderList = response.rows;
         this.total = response.total;