Merge remote-tracking branch 'origin/project1' into project1

# Conflicts:
#	src/views/processManagement/draw.vue

src/views/equipment/draw.vue

@@ -306,6 +306,11 @@
             {{ scope.row.psm || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="创建时间" prop="createDate">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.createDate, '{y}-{m}-{d}') || '-' }}
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="totalDetail>0"
@@ -516,9 +521,12 @@ export default {
         this.loadingDetail = false
       })
     },
+
+    // 处理点击
     handle(row) {
       console.log('row', row)
       this.applyId = row.businessId
+      this.pn = row.pn
       this.ptype = row.ptype
       this.pgx = row.pgx
       this.prank = row.prank
@@ -533,28 +541,19 @@ export default {
         rows: this.queryParamsDetail.rows
       }
       getEquipment(obj).then(res => {
-        if (res.code && res.code === null) {
-          this.$message.warning(res.message)
-        }
-        console.log('res')
-        if (res.rows.createDate && res.rows.createDate !== null) {
-          res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
+        if (res.code === 200) {
+          if (res.data.createDate !== null) {
+            res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
           }
-        this.detailApplyList = res.rows
+          this.detailApplyList = res.data
           this.loadingDetail = false
           this.openHandle = true
+        }
       })
-      // this.applyId = row.businessId
       this.title = '处理'
-      // this.openHandle = !this.openHandle
       this.loadingDetail = true
-      // detailList(this.queryParamsDetail).then(res => {
-      //   res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
-      //   this.totalDetail = res.total
-      //   this.detailApplyList = res.rows
-      //   this.loadingDetail = false
-      // })
     },
+
     // 获取所选行详情信息
     handleDetail(row) {
       const id = row.businessId

src/views/processManagement/draw.vue

@@ -626,6 +626,7 @@ export default {
       })
     },
 
+    // 处理弹窗里的勾选确定
     handleCance() {
       this.loadingDetail = true
       if (this.multipleSelection.length === 0) {
@@ -670,6 +671,7 @@ export default {
         }
       }
     },
+
     /** 查询warehouse列表 */
     getDeviceList() {
       this.loadingDetail = true
@@ -701,9 +703,12 @@ export default {
         this.handcheckPermissionQuery()
       }
     },
+
+    // 处理点击
     handle(row) {
       console.log('row', row)
       this.monthDate = false
+      this.openHandle = true
       this.applyId = row.businessId
       this.pn = row.pn
       this.ptype = row.ptype
@@ -720,6 +725,7 @@ export default {
         page: this.queryParamsDetail.page,
         rows: this.queryParamsDetail.rows
       }
+      // 调warehouse分页查询接口
       getEquipment(obj).then(res => {
         if (res.code === 200) {
           if (res.data.createDate !== null) {
@@ -733,7 +739,8 @@ export default {
       this.title = '处理'
       this.loadingDetail = true
     },
-    // 获取所选行详情信息
+
+    // 获取行详情信息
     handleDetail(row) {
       const id = row.businessId
       this.openDetails = true
@@ -746,7 +753,8 @@ export default {
         this.loadingDetail = false
       })
     },
-    /** 查询apply列表 */
+
+    // 查询apply表单
     getList() {
       this.isCheck = false
       this.radio1 = '2'