Merge branch 'xy3yuan1015' into test

src/js/dept/partDetailControlDept.js

@@ -234,7 +234,7 @@ $('.selectModuleType').on("input", function (e) {
 })
 //获取模块类型
 function getmoduleTypeList(val, dept) {
-    post(api.getListDoctor, { inputStr: val == "全部" ? "" : val || "", deptName: dept || deptIdTemp }).then(res => {
+    post(api.getListDoctor, { inputStr: val == "全部" ? "" : val || "", deptName: deptName }).then(res => {
         if (res.data.code == '0') {
             const moduleTypeList = res.data.data
             renderModuleTypeList(moduleTypeList)

src/js/dept/qcListCopyDept.js

@@ -186,7 +186,7 @@ function formatPostUrl(type) {
         return api.hmImproveMRPageByDept
     } else if (type == '10') {
         return api.qcResultShortByDeptPage
-    } else if (type == 33) {
+    } else if (type == '13') {
         return api.qcResultShortXYPageByDept
     } else {
         return api.qcResultDefectList
@@ -198,7 +198,7 @@ function formatExportUrl(type) {
         return api.qcCheckMRPageExportByDept
     } else if (type === '6') {
         return api.improveMRExportByDept
-    } else if (type === '33') {
+    } else if (type === '13') {
         return api.qcResultShortXYPageExportDept
     } else {
         // 默认导出接口