1207

src/api/business/planDetailSubDetail.js

@@ -20,6 +20,14 @@ export function getPlanDetailSubDetail(id) {
   })
 }
 
+// 登陆人员工段
+export function getDept() {
+  return request({
+    url: baseUrl + '/business/planDetailSubDetail/getDept',
+    method: 'get'
+  })
+}
+
 // 新增生产子计划明细
 export function savePlanDetailSubDetail(data) {
   return request({

src/views/business/productionBatch/form.vue

@@ -12,14 +12,7 @@
               <el-input-number v-model="form.lotNumber" :min="1" controls-position="right" style="width: 150px" />
             </el-form-item>
             <el-form-item label="下达日期" prop="issuanceDate">
-              <el-date-picker
-                clearable
-                v-model="form.issuanceDate"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择实际开始 时间"
-                style="width: 150px"
-              />
+              <el-date-picker clearable v-model="form.issuanceDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际开始 时间" style="width: 150px" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -29,6 +22,9 @@
             <el-form-item label="当前投产量" prop="productionVolume">
               <span>{{ form.productionVolume }}</span>
             </el-form-item>
+            <el-form-item label="选择工段" prop="lotNumber">
+              <el-select-v2 v-model="form.deptId" filterable :options="deptList" placeholder="请选择工段" style="width: 100%" />
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -40,7 +36,8 @@
 </template>
 <script setup>
 import { listProduct } from '@/api/business/product'
-import { savePlanDetailSubDetail, listPlanDetailSubDetail } from '@/api/business/planDetailSubDetail.js'
+import { savePlanDetailSubDetail, listPlanDetailSubDetail, getDept } from '@/api/business/planDetailSubDetail.js'
+import { ref } from 'vue'
 const { proxy } = getCurrentInstance()
 /** 父组件传参 */
 const props = defineProps({
@@ -59,10 +56,13 @@ const equipmentSingle = ref(false)
 const equipmentMultiple = ref(false)
 const visible = ref(false)
 const technologicalOptions = ref([])
+const deptList = ref([])
 const product = ref({})
 const isFullscreen = ref(false)
 const data = reactive({
-  form: {},
+  form: {
+    deptId: null
+  },
   rules: {}
 })
 const { form, rules } = toRefs(data)
@@ -72,6 +72,10 @@ function open(row) {
   reset()
   visible.value = true
   loading.value = true
+  getDept().then((response) => {
+    console.log(response)
+    deptList.value = response.data
+  })
   if (row) {
     form.value = row
     listProduct({ id: form.value.productId }).then((res) => {
@@ -124,6 +128,12 @@ function handleScreen() {
 function submitForm() {
   proxy.$refs['productRef'].validate((valid) => {
     if (valid) {
+      if (!form.value.deptId) {
+        return proxy.$modal.msgError('请选择工段！')
+      }
+      /**工艺版本变成P2拉取过来先绑定个假数据 */
+      form.value.technologicalProcessId = technologicalOptions.value[0].value
+      form.value.technologyVersion = technologicalOptions.value[0].label
       savePlanDetailSubDetail(form.value).then((res) => {
         if (res.code == 200) {
           proxy.$modal.msgSuccess('保存成功！')
@@ -131,7 +141,6 @@ function submitForm() {
           props.getList()
         }
       })
-      //
     }
   })
 }

src/views/business/productionBatch/index.vue

@@ -254,7 +254,7 @@ function handleProcessCurrentChange(row) {
 
 /** 设备选择对话框 */
 function openEquipment() {
-  proxy.$refs.equipmentRef.open()
+  proxy.$refs.equipmentRef.open(subRow.value.deptId)
 }
 
 /**新增按钮生产子计划 */
@@ -268,6 +268,7 @@ function handleAddSubDetail(row) {
   newDetail.productionQuantity = row.productionQuantity
   newDetail.productId = row.productId
   newDetail.productDescription = row.productDescription
+
   //给下达日期一个当前日期的默认值
   const date = new Date()
   newDetail.issuanceDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
@@ -331,6 +332,7 @@ function equipmentSelected(selection) {
     item.processId = processRow.value.id
     item.equipmentDetailId = selection[i].id
     item.equipmentDetailCode = selection[i].usageDeptCode
+    item.deptId = subRow.value.deptId
     equipment.push(item)
   }
   saveBatchEquipment(equipment).then((res) => {

src/views/business/tenant/index.vue

@@ -4,7 +4,7 @@
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item class="section-title" label="租户管理" />
       <el-form-item label="租户名称：" prop="orgName">
-        <el-input v-model="queryParams.orgName" placeholder="请输入租户名称" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="queryParams.orgName" type="text" placeholder="请输入租户名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>

src/views/dialog/equipment.vue

@@ -39,7 +39,7 @@
 </template>
 <script setup>
 import { ref } from '@vue/reactivity'
-import { listDetails } from '@/api/business/equipment'
+import { detailList } from '@/api/business/equipment'
 const total = ref(0)
 const props = defineProps({
   width: {
@@ -81,8 +81,11 @@ const { queryParams } = toRefs(data)
 /**
  * 对话框打开 事件
  */
-function open() {
+function open(deptId) {
   visible.value = true
+  if (deptId) {
+    queryParams.value.deptId = deptId
+  }
   getList()
 }
 
@@ -97,7 +100,7 @@ function close() {
  * 加载数据
  */
 function getList() {
-  listDetails(queryParams.value).then((res) => {
+  detailList(queryParams.value).then((res) => {
     list.value = res.rows
     total.value = res.total
   })

src/views/system/user/index.vue

@@ -6,32 +6,14 @@
         <div class="head-container">
           <el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
           <div style="height: 750px; overflow: auto">
-            <el-tree
-              :data="deptOptions"
-              :props="{ label: 'label', children: 'children' }"
-              :expand-on-click-node="false"
-              :filter-node-method="filterNode"
-              ref="deptTreeRef"
-              node-key="id"
-              highlight-current
-              default-expand-all
-              @node-click="handleNodeClick"
-            />
+            <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
           </div>
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <!-- 搜索区 -->
-        <el-form
-          class="list-search-container"
-          :model="queryParams"
-          ref="queryRef"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-          style="padding-bottom: 10px; padding-top: 10px"
-        >
+        <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px" style="padding-bottom: 10px; padding-top: 10px">
           <el-form-item label="用户名称：" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 130px" @keyup.enter="handleQuery" />
           </el-form-item>
@@ -93,19 +75,11 @@
               <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select
-                v-model="form.deptId"
-                :data="deptOptions"
-                :props="{ value: 'id', label: 'label', children: 'children' }"
-                value-key="id"
-                placeholder="请选择归属部门"
-                check-strictly
-                :render-after-expand="false"
-              />
+              <el-tree-select v-model="form.deptId" :data="deptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属部门" check-strictly :render-after-expand="false" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -150,13 +124,7 @@
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -189,18 +157,7 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body draggable>
-      <el-upload
-        ref="uploadRef"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <el-icon class="el-icon--upload">
           <upload-filled />
         </el-icon>
@@ -287,7 +244,7 @@ const data = reactive({
     deptId: 0
   },
   rules: {
-    deptId: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
+    // deptId: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
     userName: [
       { required: true, message: '用户名称不能为空', trigger: 'blur' },
       { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
@@ -500,6 +457,7 @@ function handleUpdate(row) {
     roleOptions.value = response.roles
     form.value.postIds = response.postIds
     form.value.roleIds = response.roleIds
+    console.log(response)
     open.value = true
     title.value = '修改用户'
     form.password = ''
@@ -511,13 +469,19 @@ function submitForm() {
     if (valid) {
       if (form.value.userId != undefined) {
         updateUser(form.value).then((response) => {
-          proxy.$modal.msgSuccess('修改成功')
-          open.value = false
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess('修改成功')
+            open.value = false
+          }
+
           getList()
         })
       } else {
+        console.log('1111')
         addUser(form.value).then((response) => {
-          proxy.$modal.msgSuccess('新增成功')
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess('新增成功')
+          }
           open.value = false
           getList()
         })