刘洋 1 ano atrás
pai
commit
c5058195c3

+ 9 - 2
src/views/sop/components/dynamic-form-item/NUMBER.vue

@@ -5,14 +5,22 @@
     :disabled="!config.writable"
     style="width: 100%"
     @change="emitChange"
+    :min="0"
+    :decimalPlaces="decimalPlaces"
+    :allowInputOverLimit="false"
   ></t-input-number>
 </template>
 <script setup name="NUMBER">
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 const props = defineProps({
   config: { type: Object },
   modelValue: { type: Number },
 });
+//需要支持只能输入整数的控件
+const integerWidgetArr = ['import_exam_student_count_2'];
+const decimalPlaces = computed(() => {
+  return integerWidgetArr.includes(props.config.formName) ? 0 : undefined;
+});
 const emit = defineEmits(['update:modelValue', 'change']);
 
 const valueData = ref(null);
@@ -21,7 +29,6 @@ const emitChange = () => {
   emit('update:modelValue', valueData.value);
   emit('change', valueData.value);
 };
-
 watch(
   () => props.modelValue,
   (val, oldval) => {

+ 1 - 1
src/views/sop/components/dynamic-form-item/SELECT.vue

@@ -52,7 +52,7 @@ const getOptions = async () => {
   if (props.config?.formId === 'engineer_users_id_1') {
     options.value = options.value.map((item) => {
       return {
-        label: `${item.name}_${item.supplierName}_${item.mobileNumber}`,
+        label: `${item.name}(${item.archivesRoleName})_${item.supplierName}_${item.mobileNumber}`,
         value: item.userId,
       };
     });

+ 14 - 0
src/views/sop/sop-manage/plan-change/index.vue

@@ -253,6 +253,7 @@ import {
   createPlanChange,
   approvePlanChange,
   planChangeDetail,
+  sopFlowViewApi,
 } from '@/api/sop';
 import { omit } from 'lodash-es';
 import { timestampFilter } from '@/utils/filter';
@@ -270,6 +271,14 @@ const props = defineProps({
     default: 'new',
   },
 });
+const flowId = props.sop.flowId;
+function updateSopInfo(crmInfo) {
+  sopInfo.value.beginTime = crmInfo.crmBeginTime;
+  sopInfo.value.examStartTime = crmInfo.examStartTime;
+  sopInfo.value.examEndTime = crmInfo.examEndTime;
+  sopInfo.value.productName = crmInfo.productName;
+  sopInfo.value.serviceName = crmInfo.serviceUnitName;
+}
 const emit = defineEmits(['confirm', 'cancel']);
 
 const sopInfo = ref({ ...props.sop });
@@ -365,12 +374,17 @@ let formData = reactive({
   remark: '',
 });
 
+const crmInfo = ref({});
 const initData = async () => {
   if (IS_NEW_MODE.value) {
     formData.serviceId = props.sop.serviceId;
     formData.sopNo = props.sop.sopNo;
     formData.crmNo = props.sop.crmNo;
     formData.flowDeploymentId = props.sop.flowDeploymentId;
+
+    const flowRes = await sopFlowViewApi({ flowId });
+    crmInfo.value = flowRes.crmInfo;
+    updateSopInfo(crmInfo.value);
     return;
   }