项目表

wente

2023-12-11 e2255cad8935c961fe161eca60dc88b0930395ad

项目表

 web/packages/components/zt-dialog/src/zt-dialog.vue

@@ -12,23 +12,28 @@
            @close="onClose">
        <slot></slot>
        <template slot="footer">
          <template v-if="isView">
            <el-button type="info" @click="close()">{{ $t('close') }}</el-button>
          </template>
          <template v-else>
            <template v-if="stepMarker && stepMarker.indexOf('first')>0">
                <el-button type="warning" @click="formSubmit('zc')">暂存</el-button>
                <el-button type="warning" @click="formSubmit('tj')" v-if="">提交
                </el-button>
              <el-button type="warning" @click="formSubmit('zc')">暂存</el-button>
              <el-button type="warning" @click="formSubmit('tj')" v-if="">提交
              </el-button>
            </template>
            <template v-else-if="stepMarker">
                <el-button type="warning" @click="formSubmit('zc')">暂存</el-button>
                <el-button type="warning" @click="formSubmit('bl')">办理</el-button>
              <el-button type="warning" @click="formSubmit('zc')">暂存</el-button>
              <el-button type="warning" @click="formSubmit('bl')">办理</el-button>
            </template>
            <el-button type="primary" @click="formSubmit('qd')" v-preventReClick v-else-if="editAble && hasConfirm">{{
                $t('confirm') }}
            </el-button>
            <el-button type="warning" @click="formSubmit('bc')" v-else-if="editAble">保存
            </el-button>

            <el-button @click="visible = false" v-if="editAble||stepMarker">{{ $t('cancel') }}</el-button>
            <el-button type="info" @click="close()" v-else>{{ $t('close') }}</el-button>

          </template>
            <slot name="footer"></slot>
        </template>
    </el-dialog>
@@ -69,7 +74,8 @@
        data() {
            return {
                dataFormBack: null,
                visible: false
                visible: false,
                isView:true,
                //editAble: true // 是否可编辑
            }
        },

 web/packages/components/zt-table-column-handle/src/zt-table-column-handle.vue

@@ -41,11 +41,7 @@
        return typeof this.hasView === 'boolean' ? this.hasView : this.hasView(row)
      },
      isCanEidt(row) {
        if(row.stepMarker && row.stepMarker.includes('wc')){
          return false
        }else {
          return typeof this.hasEdit === 'boolean' ? this.hasEdit : this.hasEdit(row)
        }
        return typeof this.hasEdit === 'boolean' ? this.hasEdit : this.hasEdit(row)
      },
      isCanDelete(row) {
        return typeof this.hasDelete === 'boolean' ? this.hasDelete : this.hasDelete(row)

 web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue

@@ -383,7 +383,7 @@
        if (!this.dataForm.disabled) {
          if (!row.stepMarker) {
            this.stepMarker = 'pzxbg_first'
            this.title = '入库申请'
            this.title = '变更申请'
          } else {
            this.title = row.stepName
            this.stepMarker = row.stepMarker

 web/src/views/modules/testCheckOrder/TestCheckOrder.vue

@@ -25,7 +25,7 @@
          <zt-table-column-handle :table="table"  :hasEdit='false' edit-perm="testCheckOrder:update"
                                  delete-perm="testCheckOrder::delete">
            <template v-slot="{row}">
              <zt-table-button type="primary" v-if="(row.stepMarker && row.stepMarker.includes('wc'))" @click="openEditWin(row)">修改</zt-table-button>
              <zt-table-button type="primary" @click="openEditWin(row)">修改</zt-table-button>
            </template>

          </zt-table-column-handle>