Merge remote-tracking branch 'origin/master'

src/views/device/repairOrder/selectSparePartsLedger.vue

@@ -6,7 +6,7 @@
     :modal="false"
     width="1100px"
     center
-    :before-close="cancel"
+    :before-close = "cancel"
   >
     <el-form
       :model="queryParams"
@@ -247,6 +247,8 @@ export default {
     },
     /** 查询备品备件台账管理列表 */
     getList() {
+      this.sparePartsLedgerList = null;
+      this.total = 0;
       this.loading = true;
       listSparePartsLedger(this.queryParams).then((response) => {
         this.sparePartsLedgerList = response.rows;

src/views/device/sparePartsApplicationRecord/index.vue

@@ -306,15 +306,15 @@
         <el-form-item label="备品备件名称" prop="spareName">
           <el-input
             v-model="form.spareName"
-            placeholder="请选择备品备件名称"
             style="width: 280px"
+            disabled
           />
         </el-form-item>
         <el-form-item label="规格型号" prop="spareModel">
           <el-input
             v-model="form.spareModel"
-            placeholder="请选择规格型号"
             style="width: 280px"
+            disabled
           />
         </el-form-item>
         <el-form-item label="库存总数量" prop="amount">
@@ -486,9 +486,6 @@ export default {
         spareName: [
           { required: true, message: "备品备件名称不能为空", trigger: "blur" },
         ],
-        spareModel: [
-          { required: true, message: "规格型号不能为空", trigger: "blur" },
-        ],
         spareQuantity: [
           { required: true, message: "数量不能为空", trigger: "blur" },
         ],
@@ -517,6 +514,7 @@ export default {
       this.form.amount = obj[0].amount;
       this.form.storageAmount = obj[0].storageAmount;
       this.form.availableQuantity = obj[0].amount - obj[0].storageAmount;
+      this.form.spareQuantity = obj[0].spareQuantity;
     },
     //设备选择
     handleSelectEquipment() {

src/views/device/sparePartsApplicationRecord/selectSinglePerson.vue

@@ -84,18 +84,6 @@
             v-if="columns[1].visible"
             :show-overflow-tooltip="true"
           />
-          <el-table-column
-            label="部门编码"
-            align="center"
-            prop="postCode"
-            v-if="columns[2].visible"
-          ></el-table-column>
-          <el-table-column
-            label="部门名称"
-            align="center"
-            prop="postName"
-            v-if="columns[3].visible"
-          ></el-table-column>
         </el-table>
 
         <pagination
@@ -149,8 +137,6 @@ export default {
       columns: [
         { key: 0, label: `人员编码`, visible: true },
         { key: 1, label: `人员名称`, visible: true },
-        { key: 2, label: `部门编码`, visible: true },
-        { key: 3, label: `部门名称`, visible: true },
       ],
     };
   },

src/views/device/sparePartsApplicationRecord/selectSparePartsLedger.vue

@@ -55,13 +55,6 @@
         >
       </el-form-item>
 
-      <el-row :gutter="10" class="mb8">
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-      </el-row>
-
       <el-table
         v-loading="loading"
         :data="sparePartsLedgerList"
@@ -136,7 +129,7 @@
     </div>
   </el-dialog>
 </template>
-  
+
   <script>
 import {
   listSparePartsLedger,
@@ -252,6 +245,8 @@ export default {
     },
     /** 查询备品备件台账管理列表 */
     getList() {
+      this.sparePartsLedgerList = null;
+      this.total = 0;
       this.loading = true;
       listSparePartsLedger(this.queryParams).then((response) => {
         this.sparePartsLedgerList = response.rows;
@@ -340,22 +335,12 @@ export default {
           message: "请勿选择多种备件！",
           type: "warning",
         });
-        // const number =
-        //   this.$refs.multipleTable.selection.amount -
-        //   this.$refs.multipleTable.selection.storageAmount;
-        // console.log("number", number);
-        // if (this.$refs.multipleTable.selection.spareQuantity > number) {
-        //   this.$message({
-        //     message: "您填入的领用数量大于库存可用数量！",
-        //     type: "warning",
-        //   });
-        // }
       } else {
         this.$emit("onSelected", this.$refs.multipleTable.selection);
         this.showFlag = false;
+        this.getList();
       }
     },
   },
 };
 </script>
-  

src/views/mes/prepare/index.vue

@@ -9,9 +9,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="订单编码" prop="orderCode">
+			<el-form-item label="订单编码" prop="workorderCodeSap">
 				<el-input
-					v-model="queryParams.orderCode"
+					v-model="queryParams.workorderCodeSap"
 					placeholder="请输入订单编码"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -51,17 +51,18 @@
 					>
 				</el-date-picker>
 			</el-form-item>
+			<!--
 			<el-form-item label="单据状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择单据状态"
-          @change="$forceUpdate()"
-          clearable
-          style="width:205px"
-          @keyup.enter.native="handleQuery">
-          <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
-          </el-select>
-			</el-form-item>
+				<el-select
+				v-model="queryParams.status"
+				placeholder="请选择单据状态"
+				@change="$forceUpdate()"
+				clearable
+				style="width:205px"
+				@keyup.enter.native="handleQuery">
+				<el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+				</el-select>
+			</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>
@@ -128,41 +129,24 @@
 		<el-table v-loading="loading" :data="prepareList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<!-- 序号 -->
-      <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
-			<el-table-column label="工单编码" align="center" prop="workorderCode" width="220" fixed/>
-			<!-- <el-table-column label="父工单" align="center" prop="parentOrder" /> -->
-			<el-table-column label="订单编码" align="center" prop="orderCode" width="220"/>
+            <el-table-column type="index" align="center" :index="indexMethod" label="序号" fixed/>
+			<el-table-column label="工单编码" align="center" prop="workorderCode" width="200" fixed/>
+			<el-table-column label="订单编码" align="center" prop="workorderCodeSap" width="200" fixed/>
 			<el-table-column label="产品编号" align="center" prop="productCode" width="180"/>
-			<!-- <el-table-column label="产品类型" align="center" prop="prodType" /> -->
-			<el-table-column label="产品名称" align="center" prop="productName" width="180"/>
-			<!-- <el-table-column label="规格型号" align="center" prop="productSpc" /> -->
+			<el-table-column label="产品名称" align="center" prop="productName" width="180" :show-overflow-tooltip="true"/>
 			<el-table-column label="工单生产日期" align="center" prop="productDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<!-- <el-table-column label="班次" align="center" prop="shiftId" /> -->
+			<!--
 			<el-table-column label="单据状态" align="center" prop="status">
 			  <template slot-scope="scope">
-          {{ scope.row.status == "L0" ? "待确认" : "已确认" }}
-        </template>
-      </el-table-column>
-			<el-table-column label="物料编号" align="center" prop="materialCode"  width="180"/>
-			<el-table-column label="物料名称" align="center" prop="materialName"  width="250"/>
-			<el-table-column label="物料规格型号" align="center" prop="materialSpc" />
-			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="生产数量" align="center" prop="quantity" />
-			<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						@click="handlePrepareDetail(scope.row)"
-						v-hasPermi="['mes:prepareDetail:list']"
-					>查看备料单</el-button>
-					<Detail ref="detail"> </Detail>
+				{{ scope.row.status == "L0" ? "待确认" : "已确认" }}
 				</template>
-			</el-table-column> -->
+			</el-table-column>-->
+			<el-table-column label="生产数量" align="center" prop="quantity" />
+			<el-table-column label="单位" align="center" prop="unit" />
 		</el-table>
 
 		<pagination
@@ -263,19 +247,21 @@
             <el-table-column
               prop="materialCode"
               label="料号"
-              width="180">
+              width="170">
             </el-table-column>
             <el-table-column
-              prop="materailName"
+              prop="materialName"
               label="物料描述"
-              width="300">
+              width="320">
             </el-table-column>
             <el-table-column
               prop="unit"
+			  width="50"
               label="单位">
             </el-table-column>
             <el-table-column
-              prop="orderCode"
+              prop="workorderCode"
+			  width="120"
               label="生产订单">
             </el-table-column>
             <el-table-column
@@ -454,7 +440,7 @@ export default {
       printPrepareByCode(this.selectPrepare[0].workorderCode).then(response => {
         console.log(response.data)
         this.printData.factory = response.data.mesPrepareDetailList[0].factoryCode
-        this.printData.productDate = response.data.mesPrepare.productDate
+        this.printData.productDate = response.data.mesPrepareDetailList[0].productDate
         this.printData.printDate = moment(new Date()).format('YYYY-MM-DD')
         this.printData.workTable = response.data.mesPrepareDetailList
         this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格

src/views/mes/reportWork/index.vue

@@ -935,7 +935,7 @@ export default {
 				return reportSap(code);
 			}).then(() => {
 				this.getList();
-				this.$modal.msgSuccess("报工成功");
+				//this.$modal.msgSuccess("报工成功");
 			}).catch(() => {});
 		},
 		/** 报工详情按钮操作 */