Merge branch 'release_1.1.0' of http://git.qmth.com.cn/sop/web into dev_1.1.0

src/views/sop/sop-manage/office-sop/index.vue

@@ -299,6 +299,7 @@ const originColumns = ref([]);
 
 const defaultTableColumns = [
   { fieldId: 'sopNo', fieldTitle: 'SOP流水号', width: 200, code: 'TEXT' },
+  { fieldId: 'courseName', fieldTitle: '科目名称', width: 200, code: 'TEXT' },
   {
     fieldId: 'taskName',
     fieldTitle: '当前节点',
@@ -321,7 +322,6 @@ const defaultTableColumns = [
   },
   { fieldId: 'crmName', fieldTitle: '项目名称', minWidth: 160, code: 'TEXT' },
   { fieldId: 'crmNo', fieldTitle: '派单号', width: 200, code: 'TEXT' },
-  { fieldId: 'courseName', fieldTitle: '科目名称', width: 200, code: 'TEXT' },
 ];
 
 // const defaultTableColumns = [

src/views/sop/sop-manage/quality-issue/index.vue

@@ -348,6 +348,15 @@ const initNew = async () => {
     };
   });
   curStep.value = tabs.value.slice(-1)[0].value;
+  if (flowId) {
+    const res = await sopFlowViewApi({ flowId });
+    crmInfo.value = res.crmInfo;
+    sopInfo.crmName = crmInfo.value.crmName;
+    sopInfo.productName = crmInfo.value.productName;
+    sopInfo.serviceName = crmInfo.value.serviceUnitName;
+    sopInfo.sopNo = res.sopNo;
+    sopInfo.customManagerTypeStr = CUSTOMER_TYPE[crmInfo.value.customType];
+  }
 };
 const initFill = async () => {
   loading.value = true;

src/views/sop/sop-manage/student-sop/index.vue

@@ -294,6 +294,7 @@ const originColumns = ref([]);
 
 const defaultTableColumns = [
   { fieldId: 'sopNo', fieldTitle: 'SOP流水号', width: 200, code: 'TEXT' },
+  { fieldId: 'courseName', fieldTitle: '科目名称', width: 200, code: 'TEXT' },
   {
     fieldId: 'taskName',
     fieldTitle: '当前节点',
@@ -316,7 +317,6 @@ const defaultTableColumns = [
   },
   { fieldId: 'crmName', fieldTitle: '项目名称', minWidth: 160, code: 'TEXT' },
   { fieldId: 'crmNo', fieldTitle: '派单号', width: 200, code: 'TEXT' },
-  { fieldId: 'courseName', fieldTitle: '科目名称', width: 200, code: 'TEXT' },
 ];
 
 // const defaultTableColumns = [