zhangxiaomu 1 год назад
Родитель
Сommit
0e744c970d
2 измененных файлов с 4 добавлено и 3 удалено
  1. 2 2
      .env.dev
  2. 2 1
      src/components/business/process/node-modal/node-modal.vue

+ 2 - 2
.env.dev

@@ -1,7 +1,7 @@
 NODE_ENV = 'development'
 VUE_APP_BUILD_TYPE='dev'
-VUE_APP_SERVER_URL='http://localhost:6001'
-#VUE_APP_SERVER_URL='https://s.dev01.dkiboss.com:6010/api'
+#VUE_APP_SERVER_URL='http://localhost:6001'
+VUE_APP_SERVER_URL='https://s.dev01.dkiboss.com:6010/api'
 VUE_APP_UPLOAD_URL='https://s.dev01.dkiboss.com:6010/api/mdm-server/file/upload'
 VUE_APP_EXPORT_URL='http://localhost:5000/'
 VUE_APP_EXPORT_SQL_URL='http://s.dev01.dkiboss.com:6010/custom-report-sql.sql'

+ 2 - 1
src/components/business/process/node-modal/node-modal.vue

@@ -62,7 +62,8 @@
                        :options="opnKindList.filter(it=>!(nodeControl?.opnKind?.invalidCode||[]).includes(it.kindCode))"/>
           </DkFormItem>
           <!--    载具模式 -->
-          <DkFormItem prop="carKind" key="carKind" :required="true" v-if="[$config.processType.dressKilnCar,$config.processType.exchangeKilnCar].includes(nodeData.opnKind)">
+          <DkFormItem prop="carKind" key="carKind" :required="true" v-if="nodeControl?.carKind?.visible
+          &&[$config.processType.dressKilnCar,$config.processType.exchangeKilnCar].includes(nodeData.opnKind)">
             <SelectPop ref="carKind" v-model="nodeData.carKind" label-key="kindName" value-key="kindCode" :multiple="false" :options="carKindList"/>
           </DkFormItem>
           <!--    计件模式    -->