update - 订单页面加同步SAP按钮

src/views/base/orderInfo/index.vue

@@ -27,6 +27,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="工单类型" prop="orderType">
         <el-select v-model="queryParams.orderType" placeholder="请选择工单类型" clearable>
           <el-option
@@ -37,6 +45,17 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="计划开始日期">
+        <el-date-picker
+          v-model="daterangeEndTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <!--      <el-form-item label="工单状态" prop="orderStatus">-->
       <!--        <el-select v-model="queryParams.orderStatus" placeholder="请选择工单状态" clearable>-->
       <!--          <el-option-->
@@ -84,7 +103,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['base:orderInfo:edit']"
-        >修改
+        >修改订单
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -117,7 +136,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="sapForm"
-        >同步SAP周计划
+        >同步SAP计划
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -201,7 +220,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['base:orderInfo:edit']"
-          >修改工单
+          >修改订单
           </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
@@ -336,6 +355,8 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      // 更新时间时间范围
+      daterangeEndTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -400,6 +421,11 @@ export default {
     /** 查询工单信息列表 */
     getList() {
       this.loading = true
+      this.queryParams.params = {}
+      if (null != this.daterangeEndTime && '' != this.daterangeEndTime) {
+        this.queryParams.params['beginEndTime'] = this.daterangeEndTime[0]
+        this.queryParams.params['endEndTime'] = this.daterangeEndTime[1]
+      }
       listOrderInfo(this.queryParams).then(response => {
         this.orderInfoList = response.rows
         this.total = response.total

src/views/base/qualityProcess/index.vue

@@ -208,7 +208,7 @@
 import { listProcessStation, getProcessStation, delProcessStation, addProcessStation, updateProcessStation } from "@/api/base/processStation";
 import { findProductLineList } from "@/api/base/productLine";
 export default {
-  name: "ProcessStation",
+  name: "QualityProcess",
   dicts: ['is_flag','process_type'],
   data() {
     return {

src/views/production/calendarInfo/index.vue

@@ -71,7 +71,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >同步SAP计划
+        >同步SAP周计划
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->

src/views/report/productTraceabilityReport/index.vue

@@ -69,16 +69,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+      <el-col :span="1.5">
-              <el-button
+        <el-button
-                type="warning"
+          type="warning"
-                plain
+          plain
-                icon="el-icon-download"
+          icon="el-icon-download"
-                size="mini"
+          size="mini"
-                @click="handleExport"
+          @click="handleExport"
-              >导出
+        >导出
-              </el-button>
+        </el-button>
-            </el-col>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -103,6 +103,13 @@
             @click="handleOrderDetails(scope.row)"
           >检验详情
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-d-arrow-right"
+            @click="findInspectInfo(scope.row)"
+          >质检材料
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -134,12 +141,12 @@
         <el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
                   ref="reportDetailRef"
         >
-<!--          <el-table-column type="selection" width="50" align="center"/>-->
+          <!--          <el-table-column type="selection" width="50" align="center"/>-->
           <el-table-column label="序号" prop="index" width="150">
           </el-table-column>
           <el-table-column label="质检工位" prop="PRODUCT_LINE_NAME" width="150">
           </el-table-column>
-          <el-table-column label="处理措施" prop="TREATMENT_MEASURE" width="150">
+          <el-table-column label="质检结果" prop="TREATMENT_MEASURE" width="150">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.treatment_measures" :value="scope.row.TREATMENT_MEASURE"/>
             </template>
@@ -163,7 +170,6 @@
   </div>
 
 
-
 </template>
 
 <script>
@@ -175,7 +181,7 @@ import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
 
 export default {
-  name: 'ReportInfo',
+  name: 'ProductTraceabilityReport',
   dicts: ['is_flag', 'treatment_measures'],
   data() {
     return {
@@ -300,12 +306,12 @@ export default {
     /** 查看明细 */
     handleOrderDetails(row) {
       // this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE})
-      if (row.BOX_CODE == null){
+      if (row.BOX_CODE == null) {
         this.$modal.msgError('该产品无MES条码！')
-        return;
+        return
       }
-      this.form.BOX_CODE= row.BOX_CODE
+      this.form.BOX_CODE = row.BOX_CODE
-      this.form.ORDER_CODE= row.ORDER_CODE
+      this.form.ORDER_CODE = row.ORDER_CODE
       productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {
         this.reportDetailList = response.data
         this.open = true
@@ -313,7 +319,11 @@ export default {
       })
 
     },
-
+    /** 查看质检材料 */
+    findInspectInfo: function(row) {
+      const orderCode = row.ORDER_CODE;
+      this.$router.push("/report/quality-material/index/" + orderCode);
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.objId)

src/views/report/qualityMaterial/index.vue

@@ -324,6 +324,9 @@ export default {
     };
   },
   created() {
+    if (this.$route.params != null && this.$route.params.orderCode != null){
+      this.queryParams.orderCode = this.$route.params && this.$route.params.orderCode;
+    }
     this.getList();
   },
   methods: {

src/views/report/scanOfflineRecordReport/index.vue

@@ -78,7 +78,7 @@
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="工厂" align="center" prop="factoryName" v-if="columns[1].visible" width="110"/>
       <el-table-column label="产线" align="center" prop="productLineName" v-if="columns[20].visible"/>
-      <el-table-column label="SAP计划编号" align="center" prop="productOrderNo" v-if="columns[3].visible" width="90"/>
+      <el-table-column label="SAP计划编号" align="center" prop="productOrderNo" v-if="columns[3].visible" width="100"/>
       <el-table-column label="销售订单号" align="center" prop="productSaleNo" v-if="columns[4].visible"/>
       <el-table-column label="销售行号" align="center" prop="productSaleLineNo" v-if="columns[5].visible"/>
       <el-table-column label="物料编码" align="center" prop="productCode" v-if="columns[6].visible" width="100"/>
@@ -86,6 +86,7 @@
       <el-table-column label="物料描述" align="center" prop="productName" v-if="columns[8].visible" width="160"/>
       <el-table-column label="公司条码" align="center" prop="productSncode" v-if="columns[2].visible" width="120"/>
       <el-table-column label="生成日期" align="center" prop="productCreatedate" v-if="columns[17].visible" width="100"/>
+      <el-table-column label="箱体码" align="center" prop="boxCode" v-if="columns[19].visible" width="120"/>
       <el-table-column label="扫描时间" align="center" prop="productScantime" width="180" v-if="columns[18].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productScantime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -99,7 +100,6 @@
       <el-table-column label="版本号" align="center" prop="productVersion" v-if="columns[14].visible"/>
       <el-table-column label="用途位" align="center" prop="productUserinfo" v-if="columns[15].visible"/>
       <el-table-column label="流通特性" align="center" prop="productCirculate" v-if="columns[16].visible"/>
-      <el-table-column label="箱体码" align="center" prop="boxCode" v-if="columns[19].visible"/>
     </el-table>
 
     <pagination