吉安感知网项目-前端
shuishen
2026-01-31 23e661d593f812c7ed08217678456e26dcd0e445
Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
4 files modified
24 ■■■■■ changed files
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue 16 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue 1 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue 4 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue 3 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -37,6 +37,10 @@
        <div class="val">{{ formData.projectExperience }}</div>
      </el-col>
      <el-col :span="12">
        <div class="label">飞手地址</div>
        <div class="val">{{ formData.flyerAddress }}</div>
      </el-col>
      <el-col :span="24">
        <div class="label">飞手证书</div>
        <div class="val">
            <el-image
@@ -169,18 +173,6 @@
                        />
                    </el-form-item>
                </el-col>
                <!-- <el-col :span="24" v-if="dialogType === 'view'">
                    <el-form-item label="飞手证书" prop="certification">
                        <el-image
                            v-for="(item, index) in formData.certification"
                            :key="index"
                            :src="item"
                            :preview-src-list="formData.certification"
                            class="gd-image"
                            style="width: 100px; height: 100px; margin-right: 10px;"
                        />
                    </el-form-item>
                </el-col> -->
            </el-row>
        </el-form>
        <template #footer>
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -73,7 +73,6 @@
                    <div class="upload-container">
                        <el-upload
                        :http-request="handleHttpRequest"
                        :limit="3"
                        :on-success="handleUploadSuccess"
                        :on-error="handleUploadError"
                        :on-remove="handleFileRemove"
applications/task-work-order/src/views/orderView/orderManage/clueEvents/ViewDiaLog.vue
@@ -32,7 +32,7 @@
                <el-table-column label="操作" class-name="operation-btns" width="140">
                    <template v-slot="{ row }">
                        <el-link type="primary" @click="openDistributeDialog(row)" v-if="permission.clueEvents_distribute && (row.distributeStatus === 0 || row.distributeStatus === 2)">
                            转为事件并分发
                            {{ row.distributeStatus === 2 ? '再次分发':'转为事件并分发' }}
                        </el-link>
                        <el-button disabled type="text" v-else>转为事件并分发</el-button>
                    </template>
@@ -76,7 +76,7 @@
const distributeStatusOptions = [
    { label: '未分发', value: 0 },
    { label: '已分发', value: 1 },
    { label: '已退回', value: 2 },
    { label: '被退回', value: 2 },
    { label: '已确认', value: 3 },
]
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -117,9 +117,10 @@
                                任务执行时间
                            </template>
                            <template v-slot="{ row }">
<!--                                gd-date-picker-popper-->
                                <el-date-picker
                                    class="gd-date-picker"
                                    popper-class="gd-date-picker-popper"
                                    popper-class=""
                                    v-model="row.executeTime"
                                    type="datetime"
                                    placeholder="请选择"