Merge remote-tracking branch 'origin/pet' into dev

src/views/keyprojects/videomanager/components/video-list.vue

@@ -50,9 +50,10 @@
           <span v-else>未定位</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" width="500">
+      <el-table-column label="操作" align="left" width="600px">
         <template slot-scope="{row}">
           <el-button :disabled="STATE == 2" type="success" icon="el-icon-caret-right" size="mini" @click="showVideo(row)">播放</el-button>
+          <el-button type="success" size="mini" @click="getOutsourced(row)">查询绑定</el-button>
           <el-button type="info" icon="el-icon-location-information" size="mini" @click="handleMap(row)">定位</el-button>
           <el-button v-show="!row.PLATFORMVIDEOMANAGEMENT_ID" :disabled="STATE == 2" type="warning" icon="el-icon-caret-right" size="mini" @click="showVideoBack(row.VIDEOURL)">回放</el-button>
           <el-button v-show="row.PLATFORMVIDEOMANAGEMENT_ID" :disabled="STATE == 2" type="warning" size="mini" @click="getRTSP(row)">获取rtsp地址</el-button>
@@ -150,7 +151,49 @@
         <el-button @click="back">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 反查重点工程 -->
+    <el-dialog
+      :visible.sync="outsourcedListVisible"
+      :title="'绑定列表'"
+      width="80%">
+      <el-table
+        v-loading="listLoading"
+        ref="multipleTable"
+        :data="outsourcedList"
+        :row-key="getRowKey"
+        :header-cell-style="{
+          'font-weight': 'bold',
+          'color': '#000'
+        }"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row
+      >
 
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
+
+        <el-table-column prop="STATE" label="状态" width="100" >
+          <template slot-scope="{row}">
+            <span v-if="row.STATE == 0">未开工</span>
+            <span v-if="row.STATE == 1">进行中</span>
+            <span v-if="row.STATE == 2">已结束</span>
+            <span v-if="row.STATE == -1">开工申请中</span>
+            <span v-if="row.STATE == -2">结束申请中</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="400">
+          <template slot-scope="{row}">
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="untie(row.VIDEOMANAGER_ID)">解绑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="outsourcedListVisible = false">返 回</el-button>
+      </div>
+    </el-dialog>
+    <!-- 反查重点工程END -->
     <platformvideo ref="platformvideo" @handleSelected="handleSelected"/>
     <BobileCamer ref="bobileCamer" @bobilehandleSelected="bobilehandleSelected"/>
   </div>
@@ -180,6 +223,9 @@ export default {
       dialogImageUrl: '',
       dialogVisible: false,
       dialogSelect: false,
+      outsourcedListVisible: false, // 重点工程
+      controlRowTemp: null, // 正在操作的row，用于删除后刷新
+      outsourcedList: [], // 重点工程
       add: true,
       del: true,
       edit: true,
@@ -735,6 +781,50 @@ export default {
     goBack() {
       this.$parent.activeName = 'List'
       this.$parent.OUTSOURCED_ID = ''
+    },
+    // 获取重点工程列表
+    async getOutsourced(row) {
+      this.listLoading = true
+      this.outsourcedListVisible = true
+      this.controlRowTemp = row
+      this.outsourcedList = []
+      requestFN(
+        `/videoResources/getRelevanceOutsourced?VIDEO_ID=${row.VIDEO_RESOURCES_ID ? row.VIDEO_RESOURCES_ID : row.PLATFORMVIDEOMANAGEMENT_ID}`,
+        {
+
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.outsourcedList = data.varList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    async untie(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        console.log(this.VIDEOMANAGER_ID)
+        requestFN(
+          '/videomanager/delete',
+          {
+            VIDEOMANAGER_ID: id
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.getOutsourced(this.controlRowTemp)
+          this.listLoading = false
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
     }
   }
 

src/views/xgf/flow/components/sendUtil.vue

@@ -38,11 +38,64 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col v-if="form.STATUS === '0'" :span="12">
+          <el-col v-if="form.STATUS === '0'" :span="24">
             <el-form-item v-if="form.STATUS === '0'" prop="OPINION" label="打回原因:">
               <el-input v-model="form.OPINION" :rows="2" type="textarea" placeholder="填写审批意见"/>
             </el-form-item>
           </el-col>
+          <el-col v-if="form.STATUS === '0'" :span="24">
+            <el-form-item v-if="form.STATUS === '0'" prop="BACK_NAME" label="打回至:">
+              <div>{{ form.BACK_NAME }}</div>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.STATUS === '0'" :span="24">
+            <el-steps :space="200" :active="+step" finish-status="success">
+              <el-step>
+                <template slot="description">
+                  <el-card class="box-card" style="margin-top: 10px" @click.native="backPoint('-1',info.BELONG_TO_CORP_NAME)">
+                    <div icon="el-icon-aim"/>
+                    <div slot="header" class="clearfix">
+                      <span>相关方端</span>
+                    </div>
+                    <div>
+                      企业名称：{{ info.BELONG_TO_CORP_NAME }}
+                    </div>
+                  </el-card>
+                </template>
+              </el-step>
+              <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX">
+                <template slot="description">
+                  <el-card class="box-card" style="margin-top: 10px" @click.native="backPoint(item.INDEX, item.APPOINT_USER_NAME)">
+                    <div slot="header" class="clearfix">
+                      <span>审批节点</span>
+                    </div>
+                    <div>
+                      <el-row>
+                        <el-col>
+                          审批人：{{ item.APPOINT_USER_NAME }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批人公司：{{ item.APPOINT_CORP_NAME }}
+                        </el-col>
+                        <el-col>
+                          审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
+                        </el-col>
+                        <el-col v-if="item.INDEX !== step">
+                          审批时间：{{ item.APPOINT_TIME }}
+                        </el-col>
+                        <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
+                          审批意见：{{ item.APPOINT_OPINION }}
+                        </el-col>
+                      </el-row>
+                    </div>
+                  </el-card>
+                </template>
+              </el-step>
+            </el-steps>
+          </el-col>
           <el-col v-if="form.STATUS === '1' && isShow" :span="12">
             <el-form-item v-if="form.STATUS === '1'" :label="menu.user +':'" prop="APPOINT_USER_ID">
               <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
@@ -114,7 +167,9 @@ export default {
         tm: new Date().getTime(),
         list: [],
         isShow: true,
-        info: {}
+        info: {},
+        BACK_NAME: '',
+        BACK_STEP: ''
       },
       rules: {
         STATUS: [
@@ -134,6 +189,9 @@ export default {
         ],
         LIMIT_END_TIME: [
           { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
+        ],
+        BACK_NAME: [
+          { required: true, message: '请填选择回节点', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -154,7 +212,9 @@ export default {
         user: '',
         uploadFile: '',
         limitFlag: ''
-      }
+      },
+      step: 0,
+      list: []
     }
   },
   methods: {
@@ -165,6 +225,8 @@ export default {
       this.form.list = JSON.stringify(e)
       this.info = e[0]
       await this.getMenu()
+      this.form.BACK_NAME = this.info.BELONG_TO_CORP_NAME
+      this.form.BACK_STEP = '-1'
 
       if (this.info.FLOWS_TYPE === '0') {
         if (this.info.FLOWS_STEP === 0) {
@@ -328,6 +390,11 @@ export default {
         list: [],
         tm: new Date().getTime()
       }
+      this.list = [
+        {
+          INDEX: '-1'
+        }
+      ]
     },
     clearInfo() {
       this.form.APPOINT_DEPARTMENT_ID = null
@@ -336,6 +403,36 @@ export default {
       this.form.APPOINT_USER_NAME = ''
       this.form.OPINION = ''
       this.form.user = ''
+      if (this.form.STATUS === '0') {
+        this.getInfo()
+      }
+    },
+    getInfo() {
+      const info = JSON.parse(this.heirloom)[0]
+      requestFN(
+        '/xgf/user/getApproveInfo', { XGF_USER_ID: info.XGF_USER_ID }
+      ).then((data) => {
+        this.list = data.flow.info
+        this.step = data.flow.STEP
+        if (data.flow.endFlag === '1') {
+          this.title = '审批中'
+        }
+        if (data.flow.endFlag === '2') {
+          this.title = '审批结束'
+        }
+        if (data.flow.endFlag === '-2') {
+          this.title = '审批驳回'
+        }
+        this.visible = true
+        this.loading = false
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    backPoint(num, name) {
+      this.form.BACK_STEP = num
+      this.form.BACK_NAME = name
+      this.$forceUpdate()
     }
   }
 }