Merge branch 'refs/heads/feature/v8.0/8.0.1' into prod

张含笑

2025-11-19 49a3d97986d2cb45cd936d6dfd3fb24130e97dd8

Merge branch 'refs/heads/feature/v8.0/8.0.1' into prod

 src/views/tickets/orderLog.vue

@@ -269,7 +269,7 @@
      <template #footer>
        <div class="dialog-footer">
          <el-button type="danger" @click="submitForm(1)" icon="el-icon-position">发起</el-button>
          <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button>
          <!-- <el-button type="primary" @click="submitForm(0)" icon="el-icon-document-add">存草稿</el-button> -->
          <el-button @click="dialogVisible = false" icon="el-icon-circle-close">取消</el-button>
        </div>
      </template>
@@ -347,7 +347,7 @@
          </el-col>
          <el-col :span="6">
            <el-form-item label="自定义识别区" prop="enable_custom_area" class="safe-height">
              <el-checkbox v-model="form.enable_custom_area"></el-checkbox>
              <el-checkbox v-model="form.enable_custom_area" :disabled="detailTitle === '工单详情'"></el-checkbox>
            </el-form-item>
          </el-col>
        </el-row>
@@ -488,7 +488,7 @@
          </el-col>
          <el-col :span="6">
            <el-form-item label="自定义识别区" prop="enable_custom_area" class="safe-height">
              <el-checkbox v-model="form.enable_custom_area"></el-checkbox>
              <el-checkbox v-model="form.enable_custom_area" :disabled="true"></el-checkbox>
            </el-form-item>
          </el-col>
        </el-row>
@@ -607,7 +607,7 @@
        { label: '待审核', name: 'WAIT_AUDIT', value: 1, count: 0 },
        { label: '已驳回', name: 'REJECTED', value: 2, count: 0 },
        { label: '已通过', name: 'PASS', value: 3, count: 0 },
        { label: '草稿', name: 'DRAFT', value: 0, count: 0 }
        // { label: '草稿', name: 'DRAFT', value: 0, count: 0 }
      ],
      filters: {
        key_word: '',
@@ -628,7 +628,7 @@
      detailVisibleCopy: false,

      statuses: [
        { label: '草稿', value: '0' },
        // { label: '草稿', value: '0' },
        { label: '待审核', value: '1' },
        { label: '已驳回', value: '2' },
        { label: '已通过', value: '3' }

 src/views/tickets/ticket.vue

@@ -451,14 +451,14 @@
            icon="el-icon-position"
            >发布
          </el-button>
          <el-button
          <!-- <el-button
            type="infoprimary"
            plain
            :loading="draftLoading"
            @click="saveDraft"
            icon="el-icon-document-add"
            >存草稿
          </el-button>
          </el-button> -->

          <el-button @click="handleCancel" icon="el-icon-circle-close">取 消</el-button>
        </div>