Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/doneTickets/maintenance/detail.vue

@@ -8,7 +8,7 @@
               type="primary"
               @click="
                 $router.push({
-                  path: '/tickets',
+                  path: '/doneTickets',
                   query: { title: '保养工单' }
                 })
               "
@@ -137,8 +137,8 @@
         </div> -->
 
         <!-- 巡点检、保养设备 -->
-        <div class="maintain_equipment_info">
-          <HeaderTitle title="巡点检设备" size="16px"></HeaderTitle>
+         <div class="maintain_equipment_info">
+          <HeaderTitle title="保养设备" size="16px"></HeaderTitle>
           <div class="maintain_equipment_info_content">
             <div
               class="equipment_item"
@@ -228,10 +228,40 @@
                       </div>
                     </template>
                   </el-table-column>
+                  <el-table-column
+                    label="现场照片"
+                    prop="photoList"
+                    width="300"
+                  >
+                    <template slot-scope="scope">
+                      <div>
+                        <el-image
+                          v-for="imgItem in scope.row.photoList"
+                          :key="imgItem"
+                          style="width: 100px; height: 100px"
+                          :src="imgItem"
+                          :preview-src-list="scope.row.photoList"
+                        >
+                        </el-image>
+                      </div>
+                    </template>
+                  </el-table-column>
                   <el-table-column label="结果" prop="result" width="200">
                   </el-table-column>
                 </el-table>
               </div>
+              <!-- <div class="matter_info">
+                <el-table :data="item.workItems || []" border>
+                  <el-table-column label="序号" align="center" width="80">
+                    <template slot-scope="scope">
+                      <span>{{ scope.$index + 1 }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="事项" prop="item" />
+                  <el-table-column label="内容" prop="content" />
+                  <el-table-column label="标准" prop="standard" />
+                </el-table>
+              </div> -->
             </div>
             <!-- <div class="btnbox" v-if="$route.query.isshow">
               <el-button class="confirm-btn" type="danger" plain @click="reject"
@@ -264,6 +294,134 @@
           </div>
         </div>
 
+
+        <!-- <div class="maintain_equipment_info">
+          <HeaderTitle title="巡点检设备" size="16px"></HeaderTitle>
+          <div class="maintain_equipment_info_content">
+            <div
+              class="equipment_item"
+              v-for="item in infoData.deviceList"
+              :key="item.id"
+            >
+              <div class="equipment_info" v-if="item.substance">
+                <div class="item_info">
+                  <span class="item_label">设备编码</span>
+                  <span class="item_value">{{ item.substance.code }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">设备名称</span>
+                  <span class="item_value">{{ item.substance.name }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">设备型号</span>
+                  <span class="item_value">{{ item.substance.model }}</span>
+                </div>
+                <div class="item_info">
+                  <span class="item_label">设备位置</span>
+                  <span class="item_value">{{
+                    item.substance.positionNames
+                  }}</span>
+                </div>
+              </div>
+              <p>操作事项</p>
+              <div class="ruleMatters_box">
+                <el-table :data="item.workItems" border>
+                  <el-table-column label="序号" width="50">
+                    <template slot-scope="scope">
+                      <span>{{ scope.$index + 1 }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="事项" prop="name" width="100">
+                    <template slot-scope="scope">
+                      <div>
+                        <span>{{ scope.row.name }}</span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="内容" prop="content" width="300">
+                    <template slot-scope="scope">
+                      <div>
+                        <span>{{ scope.row.content }}</span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作指导" prop="operationGuide">
+                    <template slot-scope="scope">
+                      <div class="operationGuide_box">
+                        <div class="left_content">
+                          <template v-if="scope.row.operationGuide">
+                            <div
+                              v-for="(item, index) in scope.row.operationGuide
+                                .toolList"
+                              :key="item.id"
+                              >{{ index + 1 }}.{{ item.name }}</div
+                            >
+                          </template>
+                        </div>
+                        <div class="line"></div>
+                        <div class="right_content">
+                          <template v-if="scope.row.operationGuide">
+                            <div
+                              v-for="(item, index) in scope.row.operationGuide
+                                .procedureList"
+                              :key="item.id"
+                              >{{ index + 1 }}.{{ item.content }}</div
+                            >
+                          </template>
+                        </div>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="标准" prop="norm" width="100">
+                    <template slot-scope="scope">
+                      <div>
+                        <span>{{ scope.row.norm }}</span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="状态" prop="status" width="100">
+                    <template slot-scope="scope">
+                      <div>
+                        <span>{{ options[scope.row.status] }}</span>
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="结果" prop="result" width="200">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div> -->
+            <!-- <div class="btnbox" v-if="$route.query.isshow">
+              <el-button class="confirm-btn" type="danger" plain @click="reject"
+                >驳回</el-button
+              >
+              <el-button class="confirm-btn" type="success" plain @click="pass"
+                >通过</el-button
+              >
+              <el-button class="cancel-btn">关闭</el-button>
+            </div> -->
+            <!-- <div class="textbox" v-if="showtext">
+              <el-input
+                type="textarea"
+                placeholder="请输入驳回原因"
+                v-model="cause"
+                maxlength="30"
+                rows="5"
+                show-word-limit
+              >
+              </el-input>
+              <div class="textbtnbox">
+                <el-button size="small" round @click="cancelreject"
+                  >取消</el-button
+                >
+                <el-button size="small" round @click="surereject"
+                  >提交</el-button
+                >
+              </div>
+            </div> -->
+          <!-- </div>
+        </div> -->
+
         <!-- 巡点检、缺陷设备报修记录 -->
         <!-- <div class="repair_notes">
           <HeaderTitle title="缺陷设备报修记录" size="16px"></HeaderTitle>

src/views/bpm/doneTickets/maintenance/index.vue

@@ -129,6 +129,16 @@
               转派
             </el-link>
           </template>
+          <!-- 工单编号slot -->
+          <template v-slot:code="{ row }">
+            <el-link
+              type="primary"
+              :underline="false"
+              @click="openDetail({ id: row.id })"
+            >
+              {{ row.code }}
+            </el-link>
+          </template>
         </ele-pro-table>
       </el-card>
     </div>
@@ -200,7 +210,8 @@
             prop: 'code',
             label: '工单编号',
             minWidth: '200',
-            align: 'center'
+            align: 'center',
+            slot: 'code'
           },
           {
             prop: 'planCode',
@@ -371,7 +382,7 @@
       },
       openDetail({ id }) {
         this.$router.push({
-          path: '/tickets/maintenance/detail',
+          path: '/doneTickets/maintenance/detail',
           query: {
             id
           }

src/views/bpm/doneTickets/patrolInspection/detail.vue

@@ -8,7 +8,7 @@
               type="primary"
               @click="
                 $router.push({
-                  path: '/tickets',
+                  path: '/doneTickets',
                   query: { title: '巡点检工单' }
                 })
               "

src/views/bpm/doneTickets/patrolInspection/index.vue

@@ -129,6 +129,16 @@
               转派
             </el-link>
           </template>
+          <!-- 工单编号slot -->
+          <template v-slot:code="{ row }">
+            <el-link
+              type="primary"
+              :underline="false"
+              @click="openDetail({ id: row.id })"
+            >
+              {{ row.code }}
+            </el-link>
+          </template>
         </ele-pro-table>
       </el-card>
     </div>
@@ -184,7 +194,8 @@
             prop: 'code',
             label: '工单编号',
             minWidth: '200',
-            align: 'center'
+            align: 'center',
+            slot: 'code'
           },
           {
             prop: 'planCode',
@@ -366,7 +377,7 @@
       },
       openDetail({ id }) {
         this.$router.push({
-          path: '/tickets/patrolInspection/detail',
+          path: '/doneTickets/patrolInspection/detail',
           query: {
             id
           }

src/views/bpm/doneTickets/repair/index.vue

@@ -140,13 +140,23 @@
           >
             转派
           </el-link>
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
             @click="openDetail(row)"
           >
             详情
+          </el-link> -->
+        </template>
+        <!-- 工单编号列 -->
+        <template v-slot:code="{ row }">
+          <el-link 
+            type="primary" 
+            :underline="false"
+            @click="openDetail(row)"
+          >
+            {{ row.code }}
           </el-link>
         </template>
       </ele-pro-table>
@@ -203,7 +213,8 @@
             label: '工单编号',
             minWidth: '200',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'planCode',