生产订单详情页

mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue

@@ -104,6 +104,7 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            
           </el-col>
           <el-col :span="6">
             <el-row>
@@ -202,6 +203,27 @@
                         <!-- <el-input disabled v-model="row.matUnit" placeholder="请选择单位" :class="{ 'alter-class': fieldHasAlterInRow('unit', row) }" /> -->
                       </el-form-item>
                     </template>
+                  </el-table-column>
+                     <el-table-column min-width="150" align="center">
+                    <template #header> <span class="hl-table_header">*</span>产成品入库仓</template>
+                    <template #default="{ row, $index }">
+                      <el-form-item :prop="`${$index}.warehouseId`" :rules="subFormRules.warehouseId" class="mb-0px!">
+                        <el-select
+                    v-model="row.warehouseId"
+                    placeholder="下拉选择"
+                    clearable
+                    class="!w-400px"
+                    @change="handleWh(row, $index)"
+                  >
+                    <el-option
+                      v-for="dict in whList"
+                      :key="dict.id"
+                      :label="dict.whName"
+                      :value="dict.id"
+                    />
+                  </el-select>
+                      </el-form-item>
+                    </template>
                   </el-table-column>
                   <el-table-column label="备注" min-width="180" align="center">
                     <template #default="{ row, $index }">
@@ -323,6 +345,8 @@ import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
 import CompositionSelect from '@/views/biz/hlvuestyle/compositionSelect.vue'
 import EquipSelect from '@/views/biz/hlvuestyle/equipSelect.vue'
 import ClientSelect from '@/views/biz/hlvuestyle/clientSelect.vue'
+import * as WarehouseApi from '@/api/biz/warehouse'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const { query } = useRoute()
@@ -374,7 +398,8 @@ const formData = ref({
   snapshotOrderTime: undefined,
   alterFieldNames: [],
   externalCode: undefined,
-  orderSource: 1
+  orderSource: 1,
+  warehouseId:undefined
 })
 const formRules = reactive({
   businessDeptId: [{ required: true, message: '提出部门不能为空', trigger: 'blur' }],
@@ -425,6 +450,7 @@ const queryData = async (type: string, id?: number) => {
   try {
     if (id) {
       formData.value = await ProjectOrderApi.getProjectOrder(id)
+// console.log(formData.value);
 
       if (formData.value.hasAlter == 1) {
         alterDisabled.value = true
@@ -762,7 +788,8 @@ const resetForm = () => {
     snapshotOrderTime: undefined,
     alterFieldNames: [],
     externalCode: undefined,
-    orderSource: 1
+    orderSource: 1,
+    warehouseId:undefined
   }
   formRef.value?.resetFields()
 }
@@ -773,7 +800,16 @@ const openMe = (url) => {
 
 const alterDisabled = ref(false)
 const detailDisabled = ref(false)
-onMounted(() => {
+//仓库全数据
+const whList = ref([])
+// const handleWh = (val,index) => {
+//  console.log( val.warehouseId,index);
+// //  formData.value.projectOrderSubs[index].warehouseId = val.id
+// }
+onMounted(async() => {
+    //- 获取仓库全数据
+  whList.value = await WarehouseApi.getWarehouseSimpList()
+
   if (query.active == 'alter') {
     alterDisabled.value = true
   }

mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue

@@ -1176,8 +1176,6 @@ onMounted(async () => {
 
   //- 获取仓库全数据
   whList.value = await WarehouseApi.getWarehouseSimpList()
-  console.log('仓库', whList.value)
-
   // formData.value.whId = Math.min.apply(
   //   Math,
   //   whList.value.map(function (i) {