变更令

src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.125:8090",
+    "target": "http://192.168.0.109:8090",
     "smsPhone": "",
     "vite": {
         "port": 5180,

src/views/tasks/components/hc-data/task-review.vue

@@ -1,64 +1,50 @@
 <template>
-    <hc-new-dialog v-model="isShow" :footer="false" is-table widths="95%" title="任务审核" @save="modalSave">
+    <hc-new-dialog v-model="isShow" :footer="false" is-table widths="96%" title="任务审核" @close="cancelClick">
         <template #header="{ titleId, titleClass }">
             <div class="hc-card-header flex items-center">
                 <div :id="titleId" :class="titleClass">任务审核 【已开启电签】</div>
-                <!-- div v-if="taskReviewType === '1'" class="ml-6 font-bold text-main">
-                    任务名称：{{ taskReviewInfo.taskName }}
-                </div -->
             </div>
         </template>
-        <div class="relative h-full flex">
-            <div :id="`hc_pdf_card_${uuid}`">
-                <hc-new-card>
-                    <hc-pdf :src="batchPdfUrl" />
-                </hc-new-card>
-            </div>
-            <div :id="`hc_table_card_${uuid}`" class="flex-1">
-                <hc-new-card>
-                    <div class="content-box">
-                        <div class="table-box">
-                            <div class="table-view">
-                                <hc-table :column="tableColumn" :datas="tableData" is-new :index-style="{ width: 60 }" is-current-row @row-click="tableRowClick" />
-                            </div>
-                        </div>
-                        <div class="radio-box">
-                            <span class="label">审批操作：</span>
-                            <el-radio-group v-model="taskReviewForm.flag">
-                                <el-radio label="OK">同意</el-radio>
-                                <el-radio label="NO">废除任务</el-radio>
-                            </el-radio-group>
-                        </div>
-                        <div class="input-box">
-                            <el-input v-model="taskReviewForm.comment" :autosize="{ minRows: 3, maxRows: 5 }" placeholder="请输入审核意见" type="textarea" />
-                        </div>
-                        <div class="footer">
-                            <el-button type="info" hc-btn @click="cancelClick">取消</el-button>
-                            <el-button :loading="confirmLoading" hc-btn type="primary" @click="confirmClick">确认审批</el-button>
-                        </div>
-                    </div>
-                </hc-new-card>
+        <div class="relative h-full">
+            <div class="hc-task-name relative">【{{ taskInfo.taskName }}】2019-10-17 中间计量申请 【第1期】 审批信息</div>
+            <div class="hc-task-body relative flex">
+                <div class="hc-task-time">
+                    <hc-body padding="10px" scrollbar style="background: #f7f7f7;">
+                        111
+                    </hc-body>
+                </div>
+                <div class="hc-task-table">
+                    <hc-body padding="10px" scrollbar style="background: #f7f7f7;">
+                        222
+                    </hc-body>
+                </div>
+                <div class="hc-task-form">
+                    <hc-body padding="10px" scrollbar style="background: #f7f7f7;">
+                        222
+                    </hc-body>
+                </div>
             </div>
         </div>
     </hc-new-dialog>
 </template>
 
 <script setup>
-import { nextTick, ref, watch } from 'vue'
-import { getRandom } from 'js-fast-way'
+import { ref, watch } from 'vue'
 
 const props = defineProps({
-    ids: {
+    tabs: {
         type: [String, Number],
         default: '',
     },
+    row: {
+        type: Object,
+        default: () => ({}),
+    },
 })
 
 //事件
 const emit = defineEmits(['finish', 'close'])
 
-const uuid = getRandom(4)
-
 //双向绑定
 // eslint-disable-next-line no-undef
 const isShow = defineModel('modelValue', {
@@ -66,120 +52,75 @@ const isShow = defineModel('modelValue', {
 })
 
 //监听
+const tabsKey = ref(props.tabs)
+const rowInfo = ref(props.row)
+const taskInfo = ref({})
+
 watch(() => [
-    props.ids,
-], ([ids]) => {
-    console.log('ids', ids)
-}, { immediate: true })
+    props.tabs,
+    props.row,
+], ([key, row]) => {
+    tabsKey.value = key
+    rowInfo.value = row
+}, {
+    immediate: true,
+    deep: true,
+})
 
 //监听
 watch(isShow, (val) => {
     if (val) {
-        setSplitRef()
+
     }
 })
 
-//初始化设置拖动分割线
-const setSplitRef = () => {
-    //配置参考： https://split.js.org/#/?direction=vertical&snapOffset=0
-    nextTick(() => {
-        window.$split(['#hc_pdf_card_' + uuid, '#hc_table_card_' + uuid], {
-            sizes: [65, 35],
-            snapOffset: 0,
-            minSize: [50, 50],
-        })
-    })
-}
-
-const batchPdfUrl = ref('https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com//upload/20230920/0a4a7e36a1fcc05e9ff83f43fcfb12a9.pdf')
-
 //表格数据
 const tableColumn = ref([
     { key: 'key1', name: '名称' },
 ])
-const tableData = ref([
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-    { key1: 'xxxadasd' },
-])
+const tableData = ref([])
 
 const tableRowClick = () => {
 
 }
 
-
-const taskReviewForm = ref({
-    flag: 'OK', comment: '',
-})
-
 //确认审批
 const confirmLoading = ref(false)
 const confirmClick = () => {
-
+    //emit('finish')
 }
 
+//取消审批
 const cancelClick = () => {
     isShow.value = false
     emit('close')
 }
-
-
-const modalSave = () => {
-    emit('finish')
-}
 </script>
 
 <style lang="scss" scoped>
-.content-box {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    .table-box {
-        position: relative;
-        flex: 1;
-        flex-basis: auto;
-        .table-view {
-            position: absolute;
-            inset: 0;
-        }
-    }
-    .radio-box {
+.hc-task-name {
+    font-weight: bold;
+    color: #1A1a1a;
+    padding-bottom: 10px;
+    border-bottom: 1px solid #f5f5f5;
+}
+.hc-task-body {
+    height: calc(100% - 27px);
+    .hc-task-time {
         position: relative;
+        height: 100%;
         flex-shrink: 0;
-        margin-top: 14px;
+        width: 200px;
     }
-    .input-box {
+    .hc-task-table, .hc-task-form {
         position: relative;
-        flex-shrink: 0;
-        margin-top: 10px;
+        height: 100%;
+        flex: 1;
+        flex-basis: auto;
     }
-    .footer {
-        position: relative;
-        flex-shrink: 0;
-        text-align: center;
-        margin-top: 14px;
-        .el-button + .el-button {
-            margin-left: 40px;
-        }
+    .hc-task-table {
+        border-left: 1px solid #e5e5e5;
+        border-right: 1px solid #e5e5e5;
     }
 }
 </style>

src/views/tasks/hc-data.vue

@@ -122,16 +122,19 @@ const tableLoading = ref(false)
 const tableListColumn = ref([
     { key: 'taskName', name: '任务名称' },
     { key: 'taskTypeName', name: '任务类型', width: '120' },
-    { key: 'taskStatusName', name: '任务状态', width: '160' },
-    { key: 'startTime', name: '开始时间', width: '180' },
-    { key: 'endTime', name: '限定时间', width: '180' },
+    { key: 'taskStatusName', name: '任务状态', width: '120' },
+    { key: 'startTime', name: '开始时间', width: '160' },
+    { key: 'endTime', name: '限定时间', width: '160' },
     { key: 'taskDesc', name: '任务描述' },
     { key: 'taskReportUserName', name: '上报人', width: '120' },
     { key: 'taskApproveUserNamesList', name: '签字人员' },
-    { key: 'evisaStatus', name: '电签状态' },
+    { key: 'evisaStatus', name: '电签状态', width: '120' },
 ])
 const tableListData = ref([
-    { taskName: '测试的' },
+    { taskName: '中间计量审批模板', type: 1 },
+    { taskName: '开工预付款计量审批模板', type: 2 },
+    { taskName: '变更令审批模板', type: 3 },
+    { taskName: '材料预付款计量申请审批模板', type: 4 },
 ])
 
 //多选