332ef51e96e950ec66c38a40a167926b680d37dc..527e5e2136c17f10d5472e5bcbbc9526bd9feebb
21 小时以前 zhouwx
修改
527e5e 对比 | 目录
22 小时以前 zhouwx
修改
1a35b6 对比 | 目录
22 小时以前 祖安之光
修改新增
8ac227 对比 | 目录
22 小时以前 祖安之光
修改新增
52af63 对比 | 目录
23 小时以前 祖安之光
修改新增
2816d4 对比 | 目录
已修改6个文件
209 ■■■■ 文件已修改
src/views/work/onlineEducation/courseManage/components/courseManageDialog.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/onlineEducation/courseManage/index.vue 116 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/onlineEducation/people/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/onlineEducation/systemManage/company/components/companyDialog.vue 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/onlineEducation/systemManage/company/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/work/onlineEducation/courseManage/components/courseManageDialog.vue
@@ -35,14 +35,14 @@
        <el-form-item label="提交单位:" prop="companyName" >
          <el-input v-model="state.form.companyName" disabled/>
        </el-form-item>
        <el-form-item label="封面:">
          <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.imgLimit' v-model:file-list="state.imgList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
            <el-icon><Plus /></el-icon>
            <template #tip>
              <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>
            </template>
          </el-upload>
        </el-form-item>
<!--        <el-form-item label="封面:">-->
<!--          <el-upload accept="image/*" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.imgLimit' v-model:file-list="state.imgList" list-type="picture-card" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >-->
<!--            <el-icon><Plus /></el-icon>-->
<!--            <template #tip>-->
<!--              <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>-->
<!--            </template>-->
<!--          </el-upload>-->
<!--        </el-form-item>-->
      </el-form>
      <template #footer>
        <span class="dialog-footer">
src/views/work/onlineEducation/courseManage/index.vue
@@ -40,73 +40,73 @@
    <!-- 表格数据 -->
    <el-table v-loading="loading" :data="dataList" :border="true">
      <el-table-column label="序号" type="index" align="center" width="80" />
      <el-table-column label="封面" prop="logo" align="center"  width="130">
        <template #default="scope">
          <div class="demo-image__preview" v-if="scope.row.logo && scope.row.logo.length>0">
            <el-image
                style="width: 100px; height: 100px"
                :src= "scope.row.logo[0]"
                :zoom-rate="1.2"
                :max-scale="7"
                :min-scale="0.2"
                :preview-src-list="scope.row.logo"
                :initial-index="0"
                fit="cover"
                :preview-teleported=true
            />
          </div>
        </template>
      </el-table-column>
<!--      <el-table-column label="封面" prop="logo" align="center"  width="130">-->
<!--        <template #default="scope">-->
<!--          <div class="demo-image__preview" v-if="scope.row.logo && scope.row.logo.length>0">-->
<!--            <el-image-->
<!--                style="width: 100px; height: 100px"-->
<!--                :src= "scope.row.logo[0]"-->
<!--                :zoom-rate="1.2"-->
<!--                :max-scale="7"-->
<!--                :min-scale="0.2"-->
<!--                :preview-src-list="scope.row.logo"-->
<!--                :initial-index="0"-->
<!--                fit="cover"-->
<!--                :preview-teleported=true-->
<!--            />-->
<!--          </div>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="课程名称" prop="name" align="center"  />
      <el-table-column label="课程分类" prop="categoryName" align="center" />
      <el-table-column label="要求课时" prop="period" align="center" >
        <template #default="scope">
          <span>{{ scope.row.period?(scope.row.period/60).toFixed(2).replace(/\.00$/, '') + '分钟':'' }}</span>
        </template>
      </el-table-column>
      <el-table-column label="提交单位" prop="companyName" align="center" />
      <el-table-column label="审核状态" prop="state" align="center" >
        <template #default="scope">
          <el-tooltip
              v-if="scope.row.state == 3 && scope.row.message !=''"
              class="box-item"
              effect="dark"
              :content="scope.row.message"
              placement="top"
          >
            <span>审批不通过</span>
          </el-tooltip>
          <span v-else>{{scope.row.state == 0?'待提交':scope.row.state == 1?'待审核':scope.row.state == 2?'审批通过':'审批不通过'}}</span>
        </template>
      </el-table-column>
<!--      <el-table-column label="要求课时" prop="period" align="center" >-->
<!--        <template #default="scope">-->
<!--          <span>{{ scope.row.period?(scope.row.period/60).toFixed(2).replace(/\.00$/, '') + '分钟':'' }}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="提交单位" prop="companyName" align="center" />-->
<!--      <el-table-column label="审核状态" prop="state" align="center" >-->
<!--        <template #default="scope">-->
<!--          <el-tooltip-->
<!--              v-if="scope.row.state == 3 && scope.row.message !=''"-->
<!--              class="box-item"-->
<!--              effect="dark"-->
<!--              :content="scope.row.message"-->
<!--              placement="top"-->
<!--          >-->
<!--            <span>审批不通过</span>-->
<!--          </el-tooltip>-->
<!--          <span v-else>{{scope.row.state == 0?'待提交':scope.row.state == 1?'待审核':scope.row.state == 2?'审批通过':'审批不通过'}}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="创建时间" prop="createTime" align="center" width="180" />
      <el-table-column label="状态" prop="status" align="center" >
<!--      <el-table-column label="状态" prop="status" align="center" >-->
        <template #default="scope" v-if="data.isAdmin">
          <el-switch
              v-if="scope.row.state == 2"
              v-model="scope.row.status"
              :active-value="0"
              :inactive-value="1"
              inline-prompt
              active-text="正常"
              inactive-text="停用"
              @change="switchStatus($event,scope.row)"
          />
          <span v-else>--</span>
        </template>
        <template #default="scope" v-else>
          <span v-if="scope.row.state == 2">{{scope.row.status == 1? '停用' : '正常'}}</span>
          <span v-else>--</span>
        </template>
      </el-table-column>
<!--        <template #default="scope" v-if="data.isAdmin">-->
<!--          <el-switch-->
<!--              v-if="scope.row.state == 2"-->
<!--              v-model="scope.row.status"-->
<!--              :active-value="0"-->
<!--              :inactive-value="1"-->
<!--              inline-prompt-->
<!--              active-text="正常"-->
<!--              inactive-text="停用"-->
<!--              @change="switchStatus($event,scope.row)"-->
<!--          />-->
<!--          <span v-else>&#45;&#45;</span>-->
<!--        </template>-->
<!--        <template #default="scope" v-else>-->
<!--          <span v-if="scope.row.state == 2">{{scope.row.status == 1? '停用' : '正常'}}</span>-->
<!--          <span v-else>&#45;&#45;</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
        <template #default="scope">
          <div v-if="data.isAdmin || data.userType == 6">
            <div v-if="scope.row.state !== 3">
              <el-button link type="primary" v-if="scope.row.state == 1" @click="openApprove(scope.row)">审核</el-button>
              <el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>
              <el-button link type="primary" @click="toChapters(scope.row)">章节</el-button>
              <el-button link type="primary" @click="toChapters(scope.row)">添加课程资源</el-button>
              <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
            </div>
            <div v-else><el-button link type="primary" @click="toChapters(scope.row)">章节</el-button></div>
@@ -116,7 +116,7 @@
              <el-button link type="primary" v-if="scope.row.state == 0 || scope.row.state == 3" @click="submitApprove(scope.row)">提交审核</el-button>
              <el-button link type="primary" v-if="scope.row.state == 1" @click="submitApprove(scope.row)">取消审核</el-button>
              <el-button link type="primary" v-if="scope.row.state !== 1" @click="openDialog('edit',scope.row)" v-hasPermi="['courseManage:list:edit']">编辑</el-button>
              <el-button link type="primary"  @click="toChapters(scope.row)">章节</el-button>
              <el-button link type="primary"  @click="toChapters(scope.row)">添加课程资源</el-button>
              <el-button link type="danger" v-if="scope.row.state !== 1" @click="handleDelete(scope.row)" v-hasPermi="['courseManage:list:del']">删除</el-button>
            </div>
            <div v-else>
src/views/work/onlineEducation/people/index.vue
@@ -56,7 +56,7 @@
        <template #default="scope">
          <el-button link type="primary" @click="openDialog('edit',scope.row)" v-hasPermi="['onlineEducationPeople:list:edit']">编辑</el-button>
          <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['onlineEducationPeople:list:del']">删除</el-button>
          <el-button link type="primary" @click="openDialog('pwd',scope.row)" v-hasPermi="['onlineEducationPeople:list:edit']">修改密码</el-button>
<!--          <el-button link type="primary" @click="openDialog('pwd',scope.row)" v-hasPermi="['onlineEducationPeople:list:edit']">修改密码</el-button>-->
        </template>
      </el-table-column>
    </el-table>
src/views/work/onlineEducation/systemManage/company/components/companyDialog.vue
@@ -21,14 +21,14 @@
        <el-form-item label="联系电话:" prop="phone" v-if="title!=='分配课时'">
          <el-input v-model.trim="state.form.phone" placeholder="请输入联系电话"></el-input>
        </el-form-item>
        <el-form-item label="当前剩余课时:" prop="remainPeriod" v-if="title!=='分配课时' && title==='编辑'">
          <el-input
              placeholder="请输入剩余课时"
              v-model.trim="state.form.remainPeriod"
              @input="state.form.remainPeriod= state.form.remainPeriod.replace(/[^0-9]/g,'')">
            <template #append >分钟</template>
          </el-input>
        </el-form-item>
<!--        <el-form-item label="当前剩余课时:" prop="remainPeriod" v-if="title!=='分配课时' && title==='编辑'">-->
<!--          <el-input-->
<!--              placeholder="请输入剩余课时"-->
<!--              v-model.trim="state.form.remainPeriod"-->
<!--              @input="state.form.remainPeriod= state.form.remainPeriod.replace(/[^0-9]/g,'')">-->
<!--            <template #append >分钟</template>-->
<!--          </el-input>-->
<!--        </el-form-item>-->
<!--        <el-form-item label="累计已用课时(秒):" prop="spendPeriod" v-if="title!=='分配课时'">-->
<!--          <el-input-->
<!--              placeholder="请输入已用课时"-->
@@ -37,16 +37,16 @@
<!--            <template #append v-if="state.form.spendPeriod"><span>{{(state.form.spendPeriod /60).toFixed(2).replace(/\.00$/, '') + '分钟'}}</span></template>-->
<!--          </el-input>-->
<!--        </el-form-item>-->
        <el-form-item label="总课时:" prop="totalPeriod">
          <el-input
              :disabled="title === '编辑'"
              placeholder="请输入总课时"
              v-model.trim="state.form.totalPeriod"
              maxlength="10"
              @input="state.form.totalPeriod = state.form.totalPeriod.replace(/[^0-9]/g,'')">
            <template #append >分钟</template>
          </el-input>
        </el-form-item>
<!--        <el-form-item label="总课时:" prop="totalPeriod">-->
<!--          <el-input-->
<!--              :disabled="title === '编辑'"-->
<!--              placeholder="请输入总课时"-->
<!--              v-model.trim="state.form.totalPeriod"-->
<!--              maxlength="10"-->
<!--              @input="state.form.totalPeriod = state.form.totalPeriod.replace(/[^0-9]/g,'')">-->
<!--            <template #append >分钟</template>-->
<!--          </el-input>-->
<!--        </el-form-item>-->
      </el-form>
      <template #footer>
        <span class="dialog-footer">
src/views/work/onlineEducation/systemManage/company/index.vue
@@ -34,21 +34,21 @@
      <el-table-column label="单位名称" prop="name" align="center" />
      <el-table-column label="负责人" prop="major" align="center"  />
      <el-table-column label="联系电话" prop="phone" align="center"/>
      <el-table-column label="当前剩余课时(分)" prop="remainPeriodMin" align="center" width="150" />
      <el-table-column label="累计已用课时(分)" prop="spendPeriodMin" align="center" width="150">
        <template #default="scope">
          <span>{{((scope.row.totalPeriod -scope.row.remainPeriod)/60).toFixed(2).replace(/\.00$/, '') + '分钟' }}</span>
        </template>
      </el-table-column>
      <el-table-column label="总课时(分)" prop="totalPeriodMin" align="center"/>
      <el-table-column label="课时变动详情" align="center" class-name="small-padding fixed-width" >
        <template #default="scope">
          <el-button link type="primary" @click="openDetail(scope.row)">查看详情</el-button>
        </template>
      </el-table-column>
<!--      <el-table-column label="当前剩余课时(分)" prop="remainPeriodMin" align="center" width="150" />-->
<!--      <el-table-column label="累计已用课时(分)" prop="spendPeriodMin" align="center" width="150">-->
<!--        <template #default="scope">-->
<!--          <span>{{((scope.row.totalPeriod -scope.row.remainPeriod)/60).toFixed(2).replace(/\.00$/, '') + '分钟' }}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
<!--      <el-table-column label="总课时(分)" prop="totalPeriodMin" align="center"/>-->
<!--      <el-table-column label="课时变动详情" align="center" class-name="small-padding fixed-width" >-->
<!--        <template #default="scope">-->
<!--          <el-button link type="primary" @click="openDetail(scope.row)">查看详情</el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
        <template #default="scope">
          <el-button link type="primary" @click="openDialog('distribute',scope.row)">分配课时</el-button>
<!--          <el-button link type="primary" @click="openDialog('distribute',scope.row)">分配课时</el-button>-->
          <el-button link type="primary" @click="openDialog('edit',scope.row)" v-hasPermi="['systemCompany:edit']">编辑</el-button>
          <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['systemCompany:del']">删除</el-button>
        </template>
src/views/work/qualityInfo/outsourcingCooperate/outsourcedProductName/components/editDialog.vue
@@ -10,7 +10,7 @@
    >
      <el-form :model="state.form" size="default" ref="superRef" :rules="state.formRules" label-width="150px" >
        <el-form-item v-if="state.isAdmin" label="单位:" prop="companyId">
          <el-select v-model="state.form.companyId" placeholder="请选择" :disabled="state.title =='查看'" clearable style="width: 100%">
          <el-select v-model="state.form.companyId" placeholder="请选择" :disabled="state.title =='查看'" clearable style="width: 100%" @change="getSupplier()">
            <el-option
                v-for="item in state.companyList"
                :key="item.id"
@@ -82,7 +82,7 @@
  if(isAdmin){
    state.companyList = companyList
  }
  await getSupplierList()
  await getSupplierList(companyId)
  state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
  state.form.companyId = companyId
  if(state.title == '编辑'||state.title == '查看'){
@@ -95,10 +95,15 @@
  dialogVisible.value = true
}
const getSupplierList = async ()=>{
const getSupplier = async ()=>{
  await getSupplierList(state.form.companyId)
}
const getSupplierList = async (companyId)=>{
  const queryParams = {
    pageNum: 1,
    pageSize: 999
    pageSize: 999,
    companyId: companyId
  }
  const res = await getSupplierPage(queryParams)
  if (res.code == 200) {