Merge remote-tracking branch 'origin/master'

src/api/mes/selfMutualInspection.js

@@ -45,3 +45,21 @@ export function listFirstInspectionRight(query) {
     params: query
   })
 }
+
+// 查询点检
+export function listPointInspection(query) {
+  return request({
+    url: '/mes/inspectionReport/listPointInspection',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询点检listCheckBox
+export function listCheckBox(query) {
+  return request({
+    url: '/mes/inspectionReport/listCheckBox',
+    method: 'get',
+    params: query
+  })
+}

src/api/quality/income.js

@@ -211,3 +211,16 @@ export function getCkeckProjectXJList(query) {
       method: 'get'
     })
   }
+
+  //合并来料检验
+export function togetherTask(recordId,factoryCode) {
+	const data = {
+		recordId,
+		factoryCode
+	}
+	return request({
+		url: '/quality/qcIncome/togetherTask',
+		method: 'post',
+		data: data
+	});
+}

src/api/wms/odsRawOrderIn.js

@@ -42,3 +42,11 @@ export function delOdsRawOrderIn(rawOrderInId) {
 		method: 'delete'
 	});
 }
+// 新增包材到货单
+export function sap105temporarilyCollected(data) {
+  return request({
+    url: '/wms/odsRawOrderIn/sap105temporarilyCollected',
+    method: 'post',
+    data: data
+  });
+}

src/views/mes/dailyReportNew/index.vue

@@ -78,6 +78,7 @@
 		</el-row>
 
 		<el-table v-loading="loading" :data="prepareList"
+		 height="500"
 		  :summary-method="getSummaries"
 		  :header-cell-style="{'text-align':'center'}"
       :cell-style="{'text-align':'center'}"

src/views/mes/firstInspection/index.vue

@@ -180,7 +180,7 @@
           <br />
         </el-col>
         <el-col :span="8">
-          <div class="text-print" >生产产线: {{ headerParameters.lineCode }}</div>
+          <div class="text-print" >生产产线: {{ headerParameters.lineName }}</div>
           <br />
         </el-col>
         <el-col :span="5">
@@ -327,6 +327,7 @@ export default {
         productionWorkshop: null, //生产车间
         reportName: 'ConversionReportRight', //表类型
         lineCode: null, //生产产线编码
+        lineName: null, //生产产线名称
         checkPeople: null, //检查人
         productName: null, //产品名称
         checkDate: null, //检查日期
@@ -416,6 +417,7 @@ export default {
     resetQuery() {
       (this.headerParameters.productionWorkshop = null), //生产车间
         (this.headerParameters.lineCode = null), //生产产线
+        (this.headerParameters.lineName = null), //生产产线
         (this.headerParameters.checkPeople = null), //检查人
         (this.headerParameters.productName = null), //产品名称
         (this.headerParameters.checkDate = null), //检查日期
@@ -437,6 +439,7 @@ export default {
         this.headerParameters.productName = response.productName; //产品名称
         this.headerParameters.remark = response.remark; //备注
         this.headerParameters.bz = response.bz; //异常处理
+        this.headerParameters.lineName = response.lineName; 
         //this.headerParameters.checkDate = response.checkDate 检查日期
         //生产产线
       });

src/views/mes/pointInspection/index.vue

@@ -0,0 +1,643 @@
+<template>
+  <div class="app-container">
+    <div id="table" v-show="showTable">
+      <el-form class="print-selfMutualInspection">
+        <el-row>
+          <el-col :span="5">
+            <img src="@/assets/logo/lanjv.png" class="lanju-logo" />
+          </el-col>
+          <el-col class="tittle-text" :span="14">
+            <span>中山榄菊日化实业有限公司</span>
+          </el-col>
+          <el-col :span="5"> </el-col>
+        </el-row>
+        <el-row>
+          <el-col class="tittle-text">
+            <span>产品转换/完产清线点检表</span>
+          </el-col>
+        </el-row>
+        <div class="formCode">表单编号:08GL05C001-014A</div>
+        <br />
+        <el-row>
+          <el-col :span="9">
+            <div>
+              生产产线:
+              <el-select
+                v-model="headerParameters.lineCode"
+                filterable
+                placeholder="请选择产线"
+                style="width: 160px"
+              >
+                <el-option
+                  v-for="item in lineCodeOption"
+                  :key="item.equipmentCode"
+                  :label="item.equipmentName"
+                  :value="item.equipmentCode"
+                >
+                </el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+          <el-col :span="10">
+            <div>
+              检查日期:
+              <el-date-picker
+                clearable
+                v-model="headerParameters.checkDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择检查日期"
+              >
+              </el-date-picker>
+            </div>
+          </el-col>
+          <el-col :span="5">
+            <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
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handlePrintPre"
+              >打印
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div>
+        <table class="bordered-table">
+          <tr>
+            <th rowspan="2" style="width: 50px">车间</th>
+            <th rowspan="2" style="width: 120px">黑蚊香</th>
+            <th style="width: 250px">产线：{{ headerParameters.lineName }}</th>
+            <th
+              th
+              v-for="item in checkBoxData[0]"
+              :key="item.key"
+              :width="tableTittleWidth"
+            >
+              <row>
+                <label>
+                  <input
+                    type="checkbox"
+                    class="check-box"
+                    v-model="item.openLine"
+                    size="4"
+                  />开线
+                </label>
+                <label>
+                  <input
+                    type="checkbox"
+                    class="check-box"
+                    v-model="item.clearLine"
+                    size="4"
+                  />清换线
+                </label>
+              </row>
+            </th>
+          </tr>
+          <tr>
+            <th>日期：{{ headerParameters.checkDate }}</th>
+            <td
+              columnspan="1"
+              v-for="(value, key) in checkBoxData[1]"
+              :key="key"
+            >
+              {{ value }}
+            </td>
+          </tr>
+          <tr>
+            <!-- 动态渲染列名 -->
+            <th
+              v-for="item in tableTittle0"
+              :key="item.key"
+              style="width: 50px"
+            >
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th
+              v-for="item in tableTittle1"
+              :key="item.key"
+              style="width: 120px"
+            >
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th
+              v-for="item in tableTittle2"
+              :key="item.key"
+              style="width: 250px"
+            >
+              {{ item.label }}
+            </th>
+            <!-- 动态渲染列名 -->
+            <th
+              v-for="item in tableTittle"
+              :key="item.key"
+              :width="tableTittleWidth"
+            >
+              {{ item.label }}
+            </th>
+          </tr>
+
+          <tr v-for="item in tableData" :key="item.id">
+            <!-- 动态渲染列值 -->
+            <td columnspan="1" v-for="(value, key) in item" :key="key">
+              {{ value }}
+            </td>
+          </tr>
+        </table>
+      </div>
+      <br />
+      <div>
+        <el-row>填写要求：</el-row>
+        <el-row>1.产线组长在开线、品种转换时填写该表。</el-row>
+        <el-row>
+          <el-col :span="20">2.在"口"中选择类别。 </el-col
+          ><el-col :span="4"
+            >班组长签字：{{ headerParameters.createBy }}</el-col
+          >
+        </el-row>
+        <el-row>3."点检结果",是填"√",否填"×",若有异常则填写实际情况。</el-row>
+      </div>
+    </div>
+
+    <div id="printPage" v-show="showPrintPage">
+      <br />
+      <el-row>
+        <el-col :span="5">
+          <img src="@/assets/logo/lanjv.png" class="lanju-logo-print" />
+        </el-col>
+        <el-col class="tittle-text-print" :span="14">
+          <span>中山榄菊日化实业有限公司</span>
+        </el-col>
+        <el-col :span="5"> </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="5"> </el-col>
+        <el-col class="tittle-text-print">
+          <span>产品转换/完产清线点检表</span>
+        </el-col>
+        <el-col :span="5"> </el-col>
+      </el-row>
+      <br />
+      <el-row>
+        <div class="formCode">表单编号:08GL05C001-014A</div>
+        <br />
+      </el-row>
+      <row>
+        <el-col :span="24">
+          <table class="bordered-table-print" border="1">
+            <tr>
+              <th rowspan="2" style="width: 50px">车间</th>
+              <th rowspan="2" style="width: 120px">黑蚊香</th>
+              <th style="width: 250px">
+                产线：{{ headerParameters.lineName }}
+              </th>
+              <th
+                th
+                v-for="item in checkBoxData[0]"
+                :key="item.key"
+                :width="tableTittleWidth"
+              >
+                <row>
+                  <label>
+                    <input
+                      type="checkbox"
+                      class="check-box"
+                      v-model="item.openLine"
+                      size="4"
+                    />开线
+                  </label>
+                  <label>
+                    <input
+                      type="checkbox"
+                      class="check-box"
+                      v-model="item.clearLine"
+                      size="4"
+                    />清换线
+                  </label>
+                </row>
+              </th>
+            </tr>
+            <tr>
+              <th>日期：{{ headerParameters.checkDate }}</th>
+              <td
+                columnspan="1"
+                v-for="(value, key) in checkBoxData[1]"
+                :key="key"
+              >
+                {{ value }}
+              </td>
+            </tr>
+            <tr>
+              <!-- 动态渲染列名 -->
+              <th
+                v-for="item in tableTittle0"
+                :key="item.key"
+                style="width: 50px"
+              >
+                {{ item.label }}
+              </th>
+              <!-- 动态渲染列名 -->
+              <th
+                v-for="item in tableTittle1"
+                :key="item.key"
+                style="width: 120px"
+              >
+                {{ item.label }}
+              </th>
+              <!-- 动态渲染列名 -->
+              <th
+                v-for="item in tableTittle2"
+                :key="item.key"
+                style="width: 250px"
+              >
+                {{ item.label }}
+              </th>
+              <!-- 动态渲染列名 -->
+              <th
+                v-for="item in tableTittle"
+                :key="item.key"
+                :width="tableTittleWidth"
+              >
+                {{ item.label }}
+              </th>
+            </tr>
+
+            <tr v-for="item in tableData" :key="item.id">
+              <!-- 动态渲染列值 -->
+              <td columnspan="1" v-for="(value, key) in item" :key="key">
+                {{ value }}
+              </td>
+            </tr>
+          </table>
+        </el-col>
+      </row>
+      <br />
+      <br />
+      <el-row>填写要求：</el-row>
+      <el-row>1.产线组长在开线、品种转换时填写该表。</el-row>
+      <el-row>
+        <el-col :span="20">2.在"口"中选择类别。 </el-col
+        ><el-col :span="4">班组长签字：{{ headerParameters.createBy }}</el-col>
+      </el-row>
+      <el-row>3."点检结果",是填"√",否填"×",若有异常则填写实际情况。</el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  listPointInspection,
+  getSelfMutualInspectionData,
+  getLineCodeList,
+  listCheckBox,
+} from "@/api/mes/selfMutualInspection";
+
+export default {
+  name: "Item",
+  dicts: ["device_item_type", "device_loop_type"],
+  data() {
+    return {
+      printData: {
+        printable: "printPage",
+        ignore: ["no-print"],
+      },
+      showPrintPage: false,
+      showTable: false,
+      lineCodeOption: [],
+      propertyNum: null,
+      tableTittle: [],
+      tableTittle0: [],
+      tableTittle1: [],
+      tableTittle2: [],
+      tableTittleWidth: null,
+      tableData: [],
+      checkBoxData: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {},
+      //表头参数
+      headerParameters: {
+        reportName: "ConversionReport", //表类型
+        productionWorkshop: null, //生产车间
+        lineCode: null, //生产产线编码
+        lineName: null, //生产产线名称
+        createBy: null, //检查人
+        productName: null, //产品名称
+        checkDate: null, //检查日期
+        bz: null, //异常处理
+        remark: null, //备注
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    // this.getDate();
+    this.getLineCode();
+    this.getList();
+  },
+  methods: {
+    dynamicWidthStyle() {
+      return { width: `${1000 / this.propertyNum}px` };
+    },
+
+    //预处理
+    handlePrintPre() {
+      this.showTable = false; //页面上的表格不显示
+      this.showPrintPage = true; //打印的表格显示
+      this.$nextTick(() => {
+        this.handlePrint();
+      });
+    },
+
+    //真正打印
+    handlePrint() {
+      printJS({
+        printable: this.printData.printable, // 'printPage', // 标签元素id
+        type: this.printData.type || "html",
+        maxWidth: 1500, // 最大宽度
+        font_size: "", // 设置字体大小
+        header: this.printData.header, // '表单',
+        targetStyles: ["*"],
+        style: "@page {margin:0 10mm};", // 可选-打印时去掉眉页眉尾
+        ignoreElements: this.printData.ignore || [], // ['no-print']
+        properties: this.printData.properties || null,
+      });
+      this.showTable = true; //页面上的表格显示
+      this.showPrintPage = false; //打印的表格不显示
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.headerParameters.lineCode == null) {
+        this.$modal.msg("您没有选择生产产线，请选择！");
+      } else if (this.headerParameters.checkDate == null) {
+        this.$modal.msg("您没有选择检查时间，请选择！");
+      } else {
+        this.getList();
+      }
+    },
+
+    getLineCode() {
+      getLineCodeList().then((response) => {
+        this.lineCodeOption = response;
+      });
+    },
+
+    /**获取默认查询时间段**/
+    // getDate() {
+    // 	let start = this.Fungetdate (0)
+    // 	this.headerParameters.checkDate = start;
+    // },
+    // Fungetdate (num) {
+    // 	var dd = new Date();
+    // 	dd.setDate(dd.getDate() + num);
+    // 	var y = dd.getFullYear();
+    // 	var m = dd.getMonth() + 1;//获取当前月份的日期
+    // 	var d = dd.getDate();
+    // 	return y + "-" + m +"-"+d;
+    // },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      (this.headerParameters.productionWorkshop = null), //生产车间
+        (this.headerParameters.lineCode = null), //生产产线
+        (this.headerParameters.lineName = null), //生产产线
+        (this.headerParameters.createBy = null), //检查人
+        (this.headerParameters.productName = null), //产品名称
+        (this.headerParameters.checkDate = null), //检查日期
+        (this.headerParameters.bz = null), //异常处理
+        (this.headerParameters.remark = null), //备注
+        // this.getDate();
+        this.getList();
+    },
+
+    // objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+    //   if (columnIndex === 1) {
+    //     // 获取当前单元格的值
+    //     const currentValue = row[column.property];
+    //     // 获取上一行相同列的值
+    //     const preRow = this.tableData[rowIndex - 1];
+    //     const preValue = preRow ? preRow[column.property] : null;
+    //     // 如果当前值和上一行的值相同，则将当前单元格隐藏
+    //     if (currentValue === preValue) {
+    //       return { rowspan: 0, colspan: 0 };
+    //     } else {
+    //       // 否则计算当前单元格应该跨越多少行
+    //       let rowspan = 1;
+    //       for (let i = rowIndex + 1; i < this.detailList.length; i++) {
+    //         const nextRow = this.tableData[i];
+    //         const nextValue = nextRow[column.property];
+    //         if (nextValue === currentValue) {
+    //           rowspan++;
+    //         } else {
+    //           break;
+    //         }
+    //       }
+    //       return { rowspan, colspan: 1 };
+    //     }
+    //   }
+    // },
+
+    /** 查询检查项维护列表 */
+    getList() {
+      this.showTable = true; //页面上的表格显示
+      this.showPrintPage = false; //打印的表格不显示
+      this.tableData = [];
+      this.tableTittle = [];
+      this.tableTittle0 = [];
+      this.tableTittle1 = [];
+      this.tableTittle2 = [];
+      this.propertyNum = null;
+      this.loading = true;
+
+      //查询上方
+      listCheckBox(this.headerParameters).then((response) => {
+        this.checkBoxData = response;
+      });
+
+      getSelfMutualInspectionData(this.headerParameters).then((response) => {
+        this.headerParameters.createBy = response.createBy; //检查人
+        this.headerParameters.productName = response.productName; //产品名称
+        this.headerParameters.remark = response.remark; //备注
+        this.headerParameters.bz = response.bz; //异常处理
+        this.headerParameters.lineName = response.lineName; 
+        //this.headerParameters.checkDate = response.checkDate 检查日期
+        //生产产线
+      });
+
+      listPointInspection(this.headerParameters).then((response) => {
+        this.tableData = response;
+        console.log("this.tableData", this.tableData);
+        this.propertyNum = Object.keys(this.tableData[0]).length - 3; //属性个数
+        this.tableTittle0.push({
+          label: "序号",
+          key: 0,
+        });
+        this.tableTittle1.push({
+          label: "点检项目",
+          key: 1,
+        });
+        this.tableTittle2.push({
+          label: "点检内容",
+          key: 2,
+        });
+        for (let i = 0; i < this.propertyNum; i++) {
+          this.tableTittle.push({
+            label: "点检结果",
+            key: i + 3,
+          });
+        }
+
+        this.tableTittleWidth = 880 / this.propertyNum + "px";
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.tittle-text {
+  text-align: center;
+  font-size: 25px;
+  font-weight: 800;
+  color: black;
+}
+
+.lanju-logo {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 50px;
+}
+
+.bordered-table {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table th,
+.bordered-table td {
+  border: 1px solid #ddd; /* 边框样式 */
+  text-align: center; /* 文本对齐 */
+  height: 35px; /* 表格高度 */
+}
+
+.bordered-table tr {
+  word-break: break-all;
+  word-wrap: break-word;
+  border-collapse: collapse;
+  height: 35px; /* 表格高度 */
+}
+
+.bordered-table-bottom {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-bottom td {
+  border: 1px solid #ddd; /* 边框样式 */
+  text-align: left; /* 文本对齐 */
+  width: 1300px; /* 表格宽度 */
+}
+
+/* 下面是和打印有关系的 */
+.tittle-text-print {
+  text-align: center;
+  font-size: 40px;
+  font-weight: 800;
+  color: black;
+}
+
+.lanju-logo-print {
+  margin-top: 15px;
+  margin-left: 15px;
+  height: 75px;
+}
+
+.text-print {
+  text-align: left;
+  font-size: 20px;
+  color: black;
+}
+
+.bordered-table-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-print td {
+  text-align: center; /* 文本对齐 */
+  height: 35px; /* 表格高度 */
+}
+
+.bordered-table-bottom-print {
+  border-collapse: collapse; /* 确保边框合并为单一边框 */
+  width: 1300px; /* 表格宽度 */
+}
+
+.bordered-table-bottom-print td {
+  text-align: left; /* 文本对齐 */
+  height: 35px; /* 表格宽度 */
+  width: 1300px; /* 表格高度 */
+}
+
+.bottom-remark {
+  margin-top: 15px;
+}
+
+.bordered-table-print tr {
+  word-break: break-all;
+  word-wrap: break-word;
+  border-collapse: collapse;
+}
+
+.formCode {
+  margin-left: 1000px;
+  font-size: 20px;
+}
+
+.check-box {
+  font-size: 3px;
+}
+</style>

src/views/mes/selfMutualInspection/index.vue

@@ -154,7 +154,7 @@
         </el-col>
         <el-col :span="9">
           <div class="text-print">
-            生产产线: {{ headerParameters.lineCode }}
+            生产产线: {{ headerParameters.lineName }}
           </div>
           <br />
         </el-col>
@@ -275,6 +275,7 @@ export default {
         reportName: "ConversionReport", //表类型
         productionWorkshop: null, //生产车间
         lineCode: null, //生产产线编码
+        lineName: null, //生产产线名称
         checkPeople: null, //检查人
         productName: null, //产品名称
         checkDate: null, //检查日期
@@ -367,6 +368,7 @@ export default {
     resetQuery() {
       (this.headerParameters.productionWorkshop = null), //生产车间
         (this.headerParameters.lineCode = null), //生产产线
+        (this.headerParameters.lineName = null), //生产产线
         (this.headerParameters.checkPeople = null), //检查人
         (this.headerParameters.productName = null), //产品名称
         (this.headerParameters.checkDate = null), //检查日期
@@ -390,6 +392,7 @@ export default {
         this.headerParameters.productName = response.productName; //产品名称
         this.headerParameters.remark = response.remark; //备注
         this.headerParameters.bz = response.bz; //异常处理
+        this.headerParameters.lineName = response.lineName; 
         //this.headerParameters.checkDate = response.checkDate 检查日期
         //生产产线
       });
@@ -418,7 +421,7 @@ export default {
 <style scoped>
 .tittle-text {
   text-align: center;
-  font-size: 25px;
+  font-size: 30px;
   font-weight: 800;
   color: black;
 }

src/views/quality/qcIncome/index.vue

@@ -134,6 +134,17 @@
 					v-hasPermi="['quality:qcIncome:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-paperclip"
+					size="mini"
+					:disabled="multiple"
+					@click="handleTogether"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>合并任务</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -390,7 +401,9 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
+import { listIncome, getIncome, delIncome, addIncome, 
+updateIncome ,changeIncomeStatus,togetherTask
+} from "@/api/quality/income";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
 import ItemSelectSupplier from "./selectSupplier.vue";
@@ -664,7 +677,16 @@ export default {
 				...this.queryParams
 			}, `income_${new Date().getTime()}.xlsx`)
 		},
-
+		/** 合并按钮操作 */
+		handleTogether(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认合并来料检验任务的数据项？').then(function() {
+				return togetherTask(recordIds.join(','),null);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("合并成功");
+			}).catch(() => {});
+		},
 		// 数据状态修改
 		handleStatusChange(row) {
 			let text = row.status === "0" ? "停用" : "启用";

src/views/wms/odsRawOrderIn/index.vue

@@ -69,9 +69,9 @@
 					icon="el-icon-edit"
 					size="mini"
 					:disabled="single"
-					@click="handleUpdate"
+					@click="handleUpdateSAP"
 					v-hasPermi="['wms:odsRawOrderIn:edit']"
-				>修改</el-button>
+				>过账</el-button>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button
@@ -84,6 +84,17 @@
 					v-hasPermi="['wms:odsRawOrderIn:remove']"
 				>删除</el-button>
 			</el-col>
+     <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['wms:odsRawOrderIn:edit']"
+        >修改</el-button>
+      </el-col>
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -111,19 +122,21 @@
 			<el-table-column label="物料描述" align="center" prop="materialDesc" :min-width="180"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商编码" align="center" prop="supplyCode" width="180"/>
-			<el-table-column label="订单数量" align="center" prop="requestAmount" />
+			<el-table-column label="收货数量" align="center" prop="requestAmount" />
-			<el-table-column label="收货数量" align="center" prop="receiptAmount" />
+<!--			<el-table-column label="收货数量" align="center" prop="receiptAmount" />-->
-			<el-table-column label="备品数量" align="center" prop="shelvesAmount" />
+<!--			<el-table-column label="备品数量" align="center" prop="shelvesAmount" />-->
-			<el-table-column label="单据状态" align="center" prop="orderStatus" />
+      <el-table-column label="单据状态" align="center" prop="orderStatus">
-
+        <template slot-scope="scope">
+          <span v-if="scope.row.orderStatus === '0'">暂收</span>
+          <span v-else-if="scope.row.orderStatus === '1'">收货完成</span>
+        </template>
+      </el-table-column>
 			<el-table-column label="质检状态" align="center" prop="qualityStatus" />
-			<el-table-column label="收货人" align="center" prop="receiptOperator" />
+      <el-table-column label="暂收物料凭证编号" align="center" prop="userDefined1" width="280"/>
-			<el-table-column label="收货时间" align="center" prop="receiptTime" width="180">
+      <el-table-column label="暂收物料凭证年度" align="center" prop="userDefined2" />
-				<template slot-scope="scope">
+      <el-table-column label="暂收返回信息" align="center" prop="userDefined3" />
-					<span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
+			<el-table-column label="收货人" align="center" prop="createBy" />
-				</template>
+			<el-table-column label="收货时间" align="center" prop="requestTime" width="180"/>
-			</el-table-column>
-
 		</el-table>
 
 		<pagination
@@ -314,7 +327,7 @@
 </template>
 
 <script>
-import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn } from "@/api/wms/odsRawOrderIn";
+import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn ,sap105temporarilyCollected} from "@/api/wms/odsRawOrderIn";
 
 export default {
 	name: "OdsRawOrderIn",
@@ -508,6 +521,19 @@ export default {
 				this.title = "修改包材到货单";
 			});
 		},
+    /** 修改按钮操作 */
+    handleUpdateSAP(row) {
+      this.reset();
+      const id =  this.ids[0]
+       let postData = this.ids.map(id => ({ id: id }));
+
+      this.$modal.confirm('是否进行过账').then(function() {
+        return sap105temporarilyCollected(JSON.stringify(postData));
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("过账完成");
+      }).catch(() => {});
+    },
 		/** 提交按钮 */
 		submitForm() {
 			this.$refs["form"].validate(valid => {