修改bug

src/api/workOrder.js

@@ -28,10 +28,11 @@ export function getOrder(orderID) {
 }
 
 // 查询工单单表2
-export function getOrder1(orderID) {
+export function getOrder1(query) {
   return request({
-    url: '/nltifsorder/detail1/' + orderID,
-    method: 'get'
+    url: '/nltifsorder/detail1',
+    method: 'get',
+    params: query
   })
 }
 

src/views/ProductionProcess/qualityTest.vue

@@ -13,7 +13,8 @@
             placeholder="选择日期"
             :editable="false"
             :clearable="false"
-            format="yyyy/MM/DD">
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="主板SN编号" prop="materSn">
@@ -278,7 +279,7 @@ export default {
       queryParams: {
         page: 1,
         rows: 10,
-        revisedStartDate: moment(new Date().getTime()).format('YYYY/MM/DD'),
+        revisedStartDate: moment(new Date()).format('YYYY/MM/DD'),
         materSn: undefined,
         orderNo: undefined
       },
@@ -342,7 +343,7 @@ export default {
      * 重置方法
      */
     resetQuery() {
-      this.queryParams.revisedStartDate = moment(new Date().getTime()).format('YYYY/MM/DD')
+      this.queryParams.revisedStartDate = moment(new Date()).format('YYYY/MM/DD')
       this.queryParams.materSn = undefined
       this.queryParams.orderNo = undefined
       this.getTestData()

src/views/ProductionProcess/workOrder.vue

@@ -180,7 +180,7 @@
       @pagination="getOrderTable"
     />
 <!--    详细信息对话框-->
-    <el-dialog v-loading="Loading4" :close-on-click-modal="false" title="工单信息" class="workOrderDialog" :visible.sync="open" width="80%" append-to-body>
+    <el-dialog v-loading="Loading4" @close="cancel" :close-on-click-modal="false" title="工单信息" class="workOrderDialog" :visible.sync="open" width="80%" append-to-body>
       <el-form ref="form" :model="form" size="small" label-width="120px">
         <el-row>
           <el-col :span="8">
@@ -270,24 +270,6 @@
                   <span>{{ scope.row.qtyRequired || '-' }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="materSource">
-                <template slot="header">
-                  <div>来源</div>
-                  <div>source</div>
-                </template>
-                <template slot-scope="scope">
-                  <span>{{ scope.row.materSource || '-' }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column :show-overflow-tooltip="true" align="center" prop="stateMater">
-                <template slot="header">
-                  <div>状态</div>
-                  <div>Status</div>
-                </template>
-                <template slot-scope="scope">
-                  <span>{{ scope.row.stateMater || '-' }}</span>
-                </template>
-              </el-table-column>
             </el-table>
             <pagination
               v-show="total1>0"
@@ -581,7 +563,7 @@ export default {
       this.open = true
       getOrder(row.businessId).then(response => {
         if (response.data === null) {
-          getOrder1(row.businessId).then(response1 => {
+          getOrder1({businessId: row.businessId}).then(response1 => {
             this.form = response1.data
             this.Loading4 = false
           })
@@ -590,15 +572,21 @@ export default {
           this.Loading4 = false
         }
       })
-      this.getBomTable(row)
-      this.getLineTable(row)
-      this.getStationTable(row)
+      this.rowsBom.contract = row.contract
+      this.rowsBom.orderNo = row.orderNo
+      this.rowsLine.businessId = row.businessId
+      this.rowsModel.partNo = row.partNo
+      this.rowsStation.orderModelId = row.orderModelId
+      let states = row.state
+      this.getBomTable()
+      this.getLineTable()
+      this.getStationTable(states)
     },
     /** 查询工单BOM数据 */
-    getBomTable(row) {
+    getBomTable() {
       this.Loading1 = true
-      this.rowsBom.contract = row.contract
-      this.rowsBom.orderNo = row.orderNo
+      // this.rowsBom.contract = row.contract
+      // this.rowsBom.orderNo = row.orderNo
       listOrderMater(this.rowsBom).then(response => {
         this.bomList = response.rows
         this.total1 = response.total
@@ -606,9 +594,9 @@ export default {
       })
     },
     /** 查询工单线别数据 */
-    getLineTable(row) {
+    getLineTable() {
       this.Loading2 = true
-      this.rowsLine.businessId = row.businessId
+      // this.rowsLine.businessId = row.businessId
       listOrderLine(this.rowsLine).then(response => {
         this.lineList = response.rows
         this.total2 = response.total
@@ -616,17 +604,17 @@ export default {
       })
     },
     /** 查询工单工站和模型数据 */
-    getStationTable(row) {
+    getStationTable(states) {
       this.Loading3 = true
-      if (row.state === '0') {
-        this.rowsModel.partNo = row.partNo
+      if (states === '0') {
+        // this.rowsModel.partNo = row.partNo
         listModel(this.rowsModel).then(response => {
           this.stationList = response.rows
           this.total3 = response.total
           this.Loading3 = false
         })
       } else {
-        this.rowsStation.orderModelId = row.orderModelId
+        // this.rowsStation.orderModelId = row.orderModelId
         listStation(this.rowsStation).then(response => {
           this.stationList = response.rows
           this.total3 = response.total
@@ -668,6 +656,10 @@ export default {
       this.bomList = []
       this.Loading1 = true
       this.tabsName = 'bom'
+      this.rowsBom.page = 1
+      this.rowsModel.page = 1
+      this.rowsStation.page = 1
+      this.rowsLine.page = 1
     },
     /** 导入按钮方法 */
     handleImport() {

src/views/productionInfo/MaterialFile.vue

@@ -430,7 +430,7 @@ export default {
     // 状态修改方法
     handleStatusChange(row) {
       const text = row.flag === '0' ? '停用' : '启用'
-      this.$confirm(`“${row.materCode}”物料即将被${text}，是否继续？`, '提示', {
+      this.$confirm(`是否确认${text}所选数据`, '提示', {
         confirmButtonText: '确定 Confirm',
         cancelButtonText: '取消 Cancel',
         cancelButtonClass: 'btn-custom-cancel',

src/views/productionInfo/Station.vue

@@ -316,7 +316,7 @@ export default {
     handleStatusChange(row) {
       console.log(row)
       const text = row.flag === '0' ? '停用' : '启用'
-      this.$confirm(`“${row.staName}”工站即将被${text}，是否继续？`, '提示', {
+      this.$confirm(`是否确认${text}所选数据`, '提示', {
         confirmButtonText: '确定 Confirm',
         cancelButtonText: '取消 Cancel',
         cancelButtonClass: 'btn-custom-cancel',

src/views/system/device/index.vue

@@ -369,7 +369,7 @@ export default {
     handleStatusChange(row) {
       const text = row.flag === '0' ? '停用' : '启用'
       // this.$confirm(`“${row.deviceName}”设备即将被${text}，是否继续？`, '提示', {
-      this.$confirm('是否确认"' + text + '"所选数据?', '警告', {
+      this.$confirm(`是否确认${text}所选数据`, '提示', {
         confirmButtonText: '确定 Confirm',
         cancelButtonText: '取消 Cancel',
         cancelButtonClass: 'btn-custom-cancel',