理化采集；工艺路线添加仓库；

src/api/pages/common/common.js

@@ -203,6 +203,8 @@ export default {
     getSelectType: 'get_select_type',
     // 获取放大镜
     getSelectMagnifier: 'get_select_magnifier',
+    // 获取理化检验单
+    getPhysicalCollect: 'get_physical_collection_by_page',
   },
 }
 

src/components/business/process/node-modal/node-modal.vue

@@ -171,6 +171,14 @@
             <SelectPop ref="backGradeIds" v-model="nodeData.backGradeIds" label-key="gradeName" value-key="gradeId"
                        :multiple="true" :options="productGradeList" @on-select="changeBackGradeIds" />
           </DkFormItem>
+          <!--    入库仓库    -->
+          <DkFormItem prop="whId" :label="$t('whCodeName')"
+                      v-if="nodeTypeList.filter(it=>it.dataValue=='入库').length && nodeData.nodeTypes && nodeData.nodeTypes.length &&
+                      nodeData.nodeTypes.includes(nodeTypeList.filter(it=>it.dataValue=='入库')[0].dataId)"
+                      :data-type="$config.dataType.array">
+            <SelectPop ref="whId" v-model="nodeData.whId" label-key="whName" value-key="whId"
+                       :multiple="false" :options="whList" />
+          </DkFormItem>
         </DkForm>
         <!--   tab4 - 流程控制    -->
         <DkForm ref="formInline" v-if="currentTab =='tab4'" v-model="nodeData" :label-max-words="6" :colCount="2">
@@ -298,6 +306,10 @@ export default {
       type: Array,
       default: () => []
     },
+    whList: {
+      type: Array,
+      default: () => []
+    },
     dataKindList: {
       type: Array,
       default: () => []

src/components/business/select-magnifier/select-magnifier.vue

@@ -1953,6 +1953,22 @@ export default {
           {field: 'placeName', width: 'auto'},
         ]
       }
+      // 理化检验
+      else if(self.type === self.$config.MagnifierType.physicalCollect){
+        self.service = this.$service.commonService
+        self.methodsName = 'getPhysicalCollect'
+        self.methodsNameDetail = 'getPhysicalCollect'
+        self.searchContent = [
+          {itemCode: 'collectNo'},
+        ]
+        self.modalWidth = 800
+        self.colCount = 2
+        self.selectKey = 'collectId'
+        self.selectLabel = 'collectNo'
+        self.columns = [
+          {field: 'collectNo', width: 'auto'},
+        ]
+      }
     }
   },
   mounted() {

src/config/index.js

@@ -1212,6 +1212,8 @@ export default {
     warehouse: 'warehouse',
     //仓位
     warehousePlace: 'warehousePlace',
+    //理化检验
+    physicalCollect: 'physicalCollect',
   },
 
   /**

src/locale/lang/zh-CN.js

@@ -318,6 +318,7 @@ export const formTitle = {
   'check-param-collection':'材料检测参数采集',
   'equip-param-collection':'设备运行参数采集',
   'product-param-collection':'在制品参数采集',
+  'physical-collection':'理化检验采集',
   parameterSetting: '检验单设计',
 }
 

src/view/process/process-flow/process-setting.vue

@@ -158,6 +158,7 @@
                  :jobList="jobList"
                  :shopList="shopList"
                  :kilnList="kilnList"
+                 :whList="whList"
                  :dictionaryDataList="dictionaryDataList"/>
       <!--  连线弹窗  -->
       <EdgeModal key="edge" v-if="process.edgeModal.display"
@@ -202,6 +203,7 @@ export default {
       dictionaryDataList:[],//数据字典
       shopList:[],//车间
       kilnList:[],//窑炉
+      whList:[],//仓库
     }
   },
   created() {
@@ -321,6 +323,15 @@ export default {
           this.kilnList = res.data.list
         }
       })
+      //仓库
+      this.excute(this.$service.warehouseService, this.$service.warehouseService.selectByCond, {
+        ftyId: this.$store.state.user.ftyId,
+        flgValid: true,
+      }).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.whList = res.data.list
+        }
+      })
     },
 
     /**

src/view/sheet/mmg/material-enter/add.vue

@@ -10,9 +10,11 @@
           <DkFormItem prop="rdsType" :label="$t('rdsTypeIn')" required data-type="number">
             <SelectPop ref="rdsType" :multiple="false" v-model="formData.rdsType" :options="[{'label':'采购入库','value':1}]"/>
           </DkFormItem>
-          <!--检验单号 todo 理化检验单-->
+          <!--检验单号-->
           <DkFormItem prop="checkId" required data-type="number">
-            <SelectPop ref="checkId" :multiple="false" v-model="formData.checkId" :options="[{'label':'理化检验单','value':1}]"/>
+            <SelectMagnifier v-model="formData.checkId" @on-ok="chooseCheckId"
+                             :type="$config.MagnifierType.physicalCollect"
+                             :multiple="false"></SelectMagnifier>
           </DkFormItem>
           <!--采购单号-->
 <!--          <DkFormItem prop="采购单号" label="采购单号" >-->
@@ -58,8 +60,8 @@ export default {
     return{
       formData:{
         rdsType: 1,
-        checkId: 1,
-        checkCode: '20231121',
+        checkId: null,
+        checkCode: null,
         carryUserId: null,
         remarks: null
       },
@@ -113,6 +115,18 @@ export default {
 
   methods: {
     /**
+     * @desc   : 选择检验单
+     * @author : 洪旭东
+     * @date   : 2023-12-01 16:44
+     */
+    chooseCheckId (val) {
+      console.log(val)
+      if (val) {
+        this.formData.checkId = val.collectId
+        this.formData.checkCode = val.collectNo
+      }
+    },
+    /**
      * @desc   : 设置传参
      * @author : 洪旭东
      * @date   : 2023-08-11 11:27

src/view/sheet/param/physical-collection/index.vue

@@ -1,6 +1,6 @@
 <!-- @desc:理化检验采集  @auth:周兴  @time:2023/10/10 14:11 -->
 <template>
-  <CommonParam :type="$route.name" :col="col" :data="data" ></CommonParam>
+  <CommonParam :type="$route.name" :col="col" :data="data" :page-type="$config.pageType.moreCol" check-id="f167ff6f-c0a7-42cc-b46b-ba28b379385b"></CommonParam>
 </template>
 
 <script>