Merge branch 'master' into houxq

src/components/ImportButton/index.vue

@@ -13,7 +13,6 @@ const handleTableRowBtns_import = ({ file }: { file: File }) => {
   return REQUEST.import({
     $type: "import",
     url: `${props.url}/import`,
-
     data: { file, ...props.d },
     onUploadProgress(progressEvent: { loaded: number; total: number }) {
       percentage.value = ~~(

src/pages/manage/mszygl/mszy/index.vue

@@ -27,7 +27,7 @@
           <remote-user-select placeholder="全部责任教师" v-model="searchForm.tmk_zrjs_user_id" v-model:model-name="searchForm.tmk_zrjs_user_name" v-model:model-real-name="searchForm.tmk_zrjs_xm" :d="{user_role_id:'75'}"></remote-user-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="全部周期" v-model="searchForm.tmk_zq" @change="initData">
+          <el-select placeholder="全部周期" v-model="searchForm.tmk_zq" @change="initData" clearable>
             <el-option v-for="(item, index) in termData" :key="index" :label="item.n" :value="item.v" />
           </el-select>
         </el-form-item>
@@ -48,7 +48,7 @@
         <div>
           <el-button v-if="isMszy" type="primary" @click="linkTo('mszygl_mszy_course_add')">新增课程</el-button>
           <el-button type="primary" @click="handleExport">导出</el-button>
-          <import-button url="/txwx/mszy_kc" :d="{tmk_sftjmszx: isMszy ? '1' : '2'}" @success="initData">
+          <import-button v-if="isMszy" url="/txwx/mszy_kc" :d="{tmk_sftjmszx: isMszy ? '1' : '2'}" @success="initData">
             <template #text>批量导入</template>
           </import-button>
           <el-button type="danger" @click="handleDelete()">删除</el-button>
@@ -262,7 +262,8 @@ const handleExport = () => {
   });
   let obj = {
     limit: "99999",
-    tmk_sftjmszx: props.isMszy ? "1" : "2"
+    tmk_sftjmszx: props.isMszy ? "1" : "2",
+    tmk_id: arr.join(",")
   };
   download("/txwx/mszy_kc/index", obj);
 }

src/pages/manage/mszygl/tjkc/index.vue

@@ -6,7 +6,7 @@
           <remote-user-select placeholder="全部责任教师" v-model="searchForm.tmk_zrjs_user_id" v-model:model-name="searchForm.tmk_zrjs_user_name" v-model:model-real-name="searchForm.tmk_zrjs_xm" :d="{user_role_id:'75'}"></remote-user-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="全部周期" v-model="searchForm.tmk_zq" @change="initData">
+          <el-select placeholder="全部周期" v-model="searchForm.tmk_zq" @change="initData" clearable>
             <el-option v-for="(item, index) in termData" :key="index" :label="item.n" :value="item.v" />
           </el-select>
         </el-form-item>
@@ -24,7 +24,7 @@
         <div>
           <el-button type="primary" @click="linkTo('mszygl_tjkc_course_add')">新增课程</el-button>
           <el-button type="primary" @click="handleExport">导出</el-button>
-          <import-button url="/txwx/mszy_kc" :d="{tmk_sftjmszx: '3'}" @success="initData">
+          <import-button url="/txwx/mszy_kc" :d="{tmk_sftjmszx: '3'}" importKey="tmk_sftjmszx=3" @success="initData">
             <template #text>批量导入</template>
           </import-button>
           <el-button type="danger" @click="handleDelete()">删除</el-button>

src/pages/manage/zyfd/AddOrEdit.vue

@@ -17,7 +17,7 @@
           <div class="flex">
             <el-form-item label="册别" prop="tz_cb">
               <el-select v-model="ruleForm.tz_cb">
-                <el-option v-for="(t, i) in cbList" :key="i" :label="t.option" :value="t.value"></el-option>
+                <el-option v-for="(t, i) in cbList" :key="i" :label="t.n" :value="t.v"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="学科" prop="tjzx_id">
@@ -105,18 +105,17 @@ console.log(id);
 let isEdit = id === undefined ? false : true;
 let title = $ref("");
 title = isEdit === false ? "新增" : "编辑";
-let cbList = $ref([
-  {
-    option: '上册',
-    value: '1',
-  }, {
-    option: '下册',
-    value: '2',
-  }, {
-    option: '全一册',
-    value: '3',
+let cbList = $ref([])
+request({
+  url: '/common/sjzd/option',
+  data: {
+    cs_code: 'TXWXCB'
   }
-])
+}).then(res => {
+  if (res.code == '1') {
+    cbList = res.data.option
+  }
+})
 let ruleForm = $ref({
   tz_mc: "",
   tjzn_json: [],