吉安感知网项目-前端
shuishen
2026-02-05 27a805021a15d31c4af0fbac47a56f5229c8178e
Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
12 files modified
44 ■■■■■ changed files
applications/task-work-order/src/styles/tags.scss 1 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue 12 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue 5 ●●●● patch | view | raw | blame | history
packages/utils/common/index.js 10 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/styles/tags.scss
@@ -73,7 +73,6 @@
  &__box {
    position: relative;
    box-sizing: border-box;
    padding-right: 106px;
    width: 100%;
    .el-tabs__item {
applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue
@@ -164,7 +164,7 @@
                <el-col :span="24">
                    <el-form-item label="项目经验" prop="projectExperience">
                        <el-input
                            class="gd-input"
                            class="gd-input-text"
                            v-model="formData.projectExperience"
                            placeholder="请输入"
                            type="textarea"
applications/task-work-order/src/views/orderView/orderDataManage/appInnovation/FormDiaLog.vue
@@ -84,7 +84,7 @@
                <el-col :span="24">
                    <el-form-item label="案例描述" prop="caseDesc">
                        <el-input
                            class="gd-input"
                            class="gd-input-text"
                            v-model="formData.caseDesc"
                            type="textarea"
                            :rows="4"
applications/task-work-order/src/views/orderView/orderDataManage/evaluate/FormDiaLog.vue
@@ -76,7 +76,7 @@
                </el-col>
                <el-col :span="24">
                    <el-form-item label="评价内容" prop="evaluationContent">
                        <el-input class="gd-input" v-model="formData.evaluationContent" type="textarea" :rows="4"
                        <el-input class="gd-input-text" v-model="formData.evaluationContent" type="textarea" :rows="4"
                            placeholder="请输入" clearable />
                    </el-form-item>
                </el-col>
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/reasonForRejectionDialog.vue
@@ -12,7 +12,7 @@
        <div class="detail-container">
            <div class="detail-cell-reject">
                <span class="cell-label">拒绝原因:</span>
                <el-input v-model="reasonForRejection" style="width: 380px" type="textarea" :rows="4" placeholder="请输入" />
                <el-input v-model="reasonForRejection" style="width: 380px" class="gd-input-text" type="textarea" :rows="4" placeholder="请输入" />
            </div>
        </div>
        <template #footer>
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue
@@ -28,7 +28,7 @@
                <el-col :span="24">
                    <el-form-item :label="formLabelStr" prop="rejectReason">
                        <el-input
                            class="gd-input"
                            class="gd-input-text"
                            v-model="formData.rejectReason"
                            type="textarea"
                            :rows="4"
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -179,7 +179,7 @@
                        <el-col :span="24">
                            <el-form-item label="巡查任务描述" prop="taskDesc">
                                <el-input
                                    class="gd-input"
                                    class="gd-input-text"
                                    type="textarea"
                                    :rows="4"
                                    v-model="formData.taskDesc"
applications/task-work-order/src/views/orderView/orderManage/operatingIncome/index.vue
@@ -38,32 +38,32 @@
        <el-row>
                <el-col :span="12">
            <el-form-item label="营业收入(元)" prop="operatingIncome">
              <el-input class="gd-input" v-model="editParams.operatingIncome" />
              <el-input class="gd-input" v-model="editParams.operatingIncome" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="综合总成本费用(元)" prop="totalCost">
              <el-input class="gd-input" v-model="editParams.totalCost" />
              <el-input class="gd-input" v-model="editParams.totalCost" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="净利润(元)" prop="netProfit">
              <el-input class="gd-input" v-model="editParams.netProfit" />
              <el-input class="gd-input" v-model="editParams.netProfit" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="收益预测(元)" prop="earnForecast">
              <el-input class="gd-input" v-model="editParams.earnForecast" />
              <el-input class="gd-input" v-model="editParams.earnForecast" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="财务内部收益率(%)" prop="financialIrr">
              <el-input class="gd-input" v-model="editParams.financialIrr" />
              <el-input class="gd-input" v-model="editParams.financialIrr" placeholder="请输入" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="市场空间" prop="marketSpace">
              <el-input class="gd-input" v-model="editParams.marketSpace" />
              <el-input class="gd-input" v-model="editParams.marketSpace" placeholder="请输入" />
            </el-form-item>
          </el-col>
        </el-row>
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -139,7 +139,7 @@
                        <el-col :span="24">
                            <el-form-item label="工单备注" prop="remark">
                                <el-input
                                    class="gd-input"
                                    class="gd-input-text"
                                    type="textarea"
                                    :rows="3"
                                    v-model="formData.remark"
applications/task-work-order/src/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue
@@ -28,7 +28,7 @@
                <el-col :span="24">
                    <el-form-item :label="formLabelStr" prop="rejectReason">
                        <el-input
                            class="gd-input"
                            class="gd-input-text"
                            v-model="formData.rejectReason"
                            type="textarea"
                            :rows="4"
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -155,7 +155,10 @@
  name: fieldRules(true,50),
  parentCode: fieldRules(true),
  regionLevel: fieldRules(true),
  sort: fieldRules(true,50),
  sort: [
        { required: true, message: '请输入'},
    ],
  status: fieldRules(true),
}
packages/utils/common/index.js
@@ -1,13 +1,3 @@
/*
 * @Author       : yuan
 * @Date         : 2026-01-20 17:01:20
 * @LastEditors  : yuan
 * @LastEditTime : 2026-01-20 17:20:21
 * @FilePath     : \packages\utils\common\index.js
 * @Description  :
 * Copyright 2026 OBKoro1, All Rights Reserved.
 * 2026-01-20 17:01:20
 */
export function fieldRules(required,max) {
// export function fieldRules({ required = true, isSelect = false, max = 50,type = 'string' }) {
    const trigger = ['blur', 'change']