删除不必要的代码

src/views/business/carrier/form.vue

@@ -1,20 +1,27 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
-  <el-dialog title="载具信息表单" v-model="visible" width="600px" append-to-body draggable>
+  <el-dialog title="载具信息表单" v-model="visible" width="400px" append-to-body draggable>
     <div class="form-container">
-      <el-form ref="vehicleRef" class="master-container" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="载具编号" prop="code">
+      <el-form ref="carrierFormRef" class="master-container" :model="form" label-width="80px">
+        <el-form-item label="载具编号" prop="code" required>
           <el-input v-model="form.code" placeholder="请输入载具编号" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="是否废弃" prop="remark">
-          <el-input v-model="form.isAbandoned" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="废弃原因" prop="remark">
-          <el-input v-model="form.abandonmentReason" placeholder="请输入废弃原因" required />
+        <el-form-item label="是否废弃" prop="isAbandoned">
+          <el-select v-model="form.isAbandoned" placeholder="请选择是否为工段">
+            <el-option v-for="item in carrier_status" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
         </el-form-item>
+        <template v-if="form.isAbandoned === 1">
+          <el-form-item label="废弃日期" prop="abandonmentDate" required>
+            <el-input v-model="form.abandonmentDate" placeholder="请输入废弃日期" />
+          </el-form-item>
+          <el-form-item label="废弃原因" prop="abandonmentReason" required>
+            <el-input v-model="form.abandonmentReason" placeholder="请输入废弃原因" />
+          </el-form-item>
+        </template>
       </el-form>
     </div>
     <template #footer>
@@ -25,73 +32,73 @@
 </template>
 <script setup>
 import { getCarrier, saveCarrier } from '@/api/business/carrier'
+import { ref } from 'vue'
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['handleSaveSuccess'])
+const { carrier_status } = proxy.useDict('carrier_status')
 
 const loading = ref(false)
 const visible = ref(false)
-const data = reactive({
-  form: {},
-  rules: {
-    code: [{ required: true, message: '载具编号不能为空', trigger: 'blur' }],
-    sort: [{ required: true, message: '载具排序不能为空', trigger: 'blur' }]
-  }
-})
-const { form, rules } = toRefs(data)
+const form = ref({})
+
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
-function open(id) {
+const open = (data) => {
   reset()
   visible.value = true
-  if (id) {
-    getCarrier(id).then((response) => {
-      form.value = response.data
-    })
-  }
-}
-
-/** 取消按钮 */
-function handleCancel() {
-  visible.value = false
-  reset()
+  loading.value = true
+  form.value.categoryId = data.categoryId
+  getCarrier(data.id || 0).then((res) => {
+    if (res.data) {
+      form.value = res.data
+    }
+    loading.value = false
+  })
 }
 
 /** 表单重置 */
-function reset() {
+const reset = () => {
   form.value = {
     id: null,
-    deptId: null,
-    companyId: null,
-    parentId: null,
-    code: null,
-    name: null,
-    remark: null,
-    sort: null,
-    createTime: null,
-    creatorId: null,
-    updateTime: null,
-    updaterId: null,
-    deleted: null,
-    version: null
+    categoryId: 0,
+    isAbandoned: 0,
+    code: '',
+    abandonmentDate: '',
+    abandonmentReason: '',
+    remark: ''
   }
-  proxy.resetForm('vehicleRef')
+  proxy.resetForm('carrierFormRef')
 }
 
 /** 提交按钮 */
-function handleSave() {
-  proxy.$refs['vehicleRef'].validate((valid) => {
-    if (valid) {
-      saveCarrier(form.value).then((res) => {
-        if (res.code === 200) {
-          proxy.$modal.msgSuccess('操作成功')
-          emit('handleSaveSuccess')
-        }
-        visible.value = false
-      })
+const handleSave = () => {
+  if (form.value.code === '') {
+    proxy.$modal.msgError('载具编号不能为空')
+    return
+  }
+  if (form.value.isAbandoned === 1 && form.value.abandonmentDate === '') {
+    proxy.$modal.msgError('废弃日期不能为空')
+    return
+  }
+  if (form.value.isAbandoned === 1 && form.value.abandonmentReason === '') {
+    proxy.$modal.msgError('废弃原因不能为空')
+    return
+  }
+  saveCarrier(form.value).then((res) => {
+    if (res.code === 200) {
+      proxy.$modal.msgSuccess('操作成功')
+      emit('handleSaveSuccess')
     }
+    visible.value = false
   })
 }
 
+/** 取消按钮 */
+const handleCancel = () => {
+  visible.value = false
+  reset()
+}
+
 /** 暴露给父组件的方法 */
 defineExpose({
   open

src/views/business/carrier/formCategory.vue

@@ -1,7 +1,10 @@
 <template>
-  <el-dialog title="载具类别表单" v-model="visible" width="600px" append-to-body draggable>
+  <el-dialog title="载具类别表单" v-model="visible" width="400px" append-to-body draggable>
     <div class="form-container">
-      <el-form ref="carrierCategoryRef" class="master-container" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="carrierCategoryRef" v-loading="loading" class="master-container" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父级类别" prop="parentId">
+          <el-tree-select v-model="form.parentId" :data="parentCategories" check-strictly :render-after-expand="false" />
+        </el-form-item>
         <el-form-item label="类别名称" prop="name">
           <el-input v-model="form.name" placeholder="类别名称" />
         </el-form-item>
@@ -20,16 +23,10 @@
 import { getCategory, saveCategory } from '@/api/business/carrier'
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['handleSaveSuccess'])
-/** 父组件传参 */
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {}
-  }
-})
-const { getList } = toRefs(props)
-/** 字典数组区 */
-/** 表单抽屉 页变量 */
+
+/** 父类别 */
+const parentCategories = ref([])
+
 const loading = ref(false)
 const visible = ref(false)
 const data = reactive({
@@ -45,11 +42,19 @@ const { form, rules } = toRefs(data)
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getCategory(id).then((response) => {
-      form.value = response.data
+  loading.value = true
+  getCategory(id || 0).then((res) => {
+    if (res.data.formData) {
+      form.value = res.data.formData
+    }
+    parentCategories.value = res.data.parentOptions
+    parentCategories.value.unshift({
+      value: '0',
+      label: '一级分类'
     })
-  }
+
+    loading.value = false
+  })
 }
 
 /** 取消按钮 */
@@ -62,7 +67,7 @@ function handleCancel() {
 function reset() {
   form.value = {
     id: null,
-    parentId: 0,
+    parentId: '0',
     code: '',
     name: '',
     remark: '',

src/views/business/carrier/index.vue

@@ -200,7 +200,7 @@ const handleQueryCarrier = () => {
 
 /** 修改按钮操作 */
 function handleShowCarrierDialog(id) {
-  proxy.$refs.carrierRef.open(id)
+  proxy.$refs.carrierRef.open({ categoryId: currentCategory.value.id, id: id })
 }
 
 /** 删除按钮操作 */

src/views/business/department/form.vue

@@ -24,9 +24,8 @@
           <el-col :span="12">
             <el-form-item label="是否为工段">
               <el-select v-model="form.isWorkSection" placeholder="请选择是否为工段">
-                <el-option v-for="item in dept_status" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in dept_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
-              <!-- <el-select-v2 v-model="form.isWorkSection" clearable filterable :options="dept_status" placeholder="请选择是否为工段" /> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -59,7 +58,7 @@ const props = defineProps({
   }
 })
 const { getList } = toRefs(props)
-const { dept_status } = proxy.useDict('dept_status')
+const { dept_type } = proxy.useDict('dept_type')
 /** 字典数组区 */
 /** 表单抽屉 页变量 */
 const visible = ref(false)

src/views/business/department/index.vue

@@ -28,7 +28,7 @@
             <el-table-column label="部门名称" prop="label" header-align="center" />
             <el-table-column label="是否为工段" prop="isWorkSection" width="70" align="center">
               <template #default="scope">
-                <dict-tag :options="dept_status" :value="scope.row.isWorkSection" />
+                <dict-tag :options="dept_type" :value="scope.row.isWorkSection" />
               </template>
             </el-table-column>
             <el-table-column label="操作" width="150" align="center">
@@ -115,7 +115,7 @@ import deptForm from './form'
 import person from '@/views/dialog/person.vue'
 import { ref } from 'vue'
 const { proxy } = getCurrentInstance()
-const { dept_status } = proxy.useDict('dept_status')
+const { dept_type } = proxy.useDict('dept_type')
 /** 查询 对象 */
 const deptList = ref([])
 const userList = ref([])

src/views/business/equipmentMaintenance/form.vue

@@ -1,19 +1,11 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
   <div class="el-drawer__wrapper">
-    <el-drawer :title="title" v-model="visible" direction="rtl" size="100%">
+    <el-drawer title="项目信息" v-model="visible" direction="rtl" size="100%">
       <div class="page-container form-container">
         <div class="form-btns-container">
-          <span class="title-label"
-            ><el-icon>
-              <Document />
-            </el-icon>
-            项目信息</span
-          >
           <el-button-group>
-            <el-button v-if="editStatus" type="primary" icon="Finished" @click="submitForm">保存</el-button>
-            <el-button v-else type="warning" icon="Edit" @click="editStatus = true">编辑</el-button>
-            <el-button v-if="form.id && editStatus" type="info" icon="Close" @click="editStatus = false">取消编辑</el-button>
+            <el-button type="primary" icon="Finished" @click="submitForm">保存</el-button>
             <el-button v-if="form.id" type="success" @click="getForm"> <i class="fa fa-refresh" aria-hidden="true" /> 刷新 </el-button>
           </el-button-group>
           <div class="screen-btn" @click="handleScreen">
@@ -36,26 +28,22 @@
           <el-row :gutter="30">
             <el-col :span="6">
               <el-form-item label="设备类别编号" prop="code">
-                <el-input v-if="editStatus" v-model="form.code" placeholder="请输入设备类别编号" />
-                <span v-else>{{ form.code }}</span>
+                <el-input v-model="form.code" placeholder="请输入设备类别编号" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别名称" prop="name">
-                <el-input v-if="editStatus" v-model="form.name" placeholder="请输入设备类别名称" />
-                <span v-else>{{ form.name }}</span>
+                <el-input v-model="form.name" placeholder="请输入设备类别名称" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别描述" prop="remark">
-                <el-input v-if="editStatus" v-model="form.remark" placeholder="请输入设备类别描述" />
-                <span v-else>{{ form.remark }}</span>
+                <el-input v-model="form.remark" placeholder="请输入设备类别描述" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别排序" prop="sort">
-                <el-input v-if="editStatus" v-model="form.sort" placeholder="请输入设备类别排序" />
-                <span v-else>{{ form.sort }}</span>
+                <el-input v-model="form.sort" placeholder="请输入设备类别排序" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -67,23 +55,10 @@
 <script setup>
 import { getEquipmentMaintenance, addEquipmentMaintenance, updateEquipmentMaintenance } from '@/api/business/equipmentMaintenance'
 const { proxy } = getCurrentInstance()
-/** 父组件传参 */
-const props = defineProps({
-  getList: {
-    type: Function,
-    default: () => {}
-  }
-})
-const { getList } = toRefs(props)
-/** 字典数组区 */
-/** 表单抽屉 页变量 */
-const title = ref('')
+
 const loading = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
-const editStatus = ref(false)
 const isFullscreen = ref(false)
-const webHost = import.meta.env.VITE_APP_BASE_API
 const data = reactive({
   form: {},
   rules: {
@@ -98,16 +73,13 @@ const { form, rules } = toRefs(data)
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getEquipmentMaintenance(id).then((response) => {
+  loading.value = true
+  getEquipmentMaintenance(id || 0).then((response) => {
+    if (response.data) {
       form.value = response.data
-      editStatus.value = false
-      title.value = '修改项目信息'
-    })
-  } else {
-    editStatus.value = true
-    title.value = '添加项目信息'
-  }
+    }
+    loading.value = false
+  })
 }
 
 /** 取消按钮 */
@@ -152,13 +124,11 @@ function submitForm() {
         updateEquipmentMaintenance(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           visible.value = false
-          getList.value()
         })
       } else {
         addEquipmentMaintenance(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           visible.value = false
-          getList.value()
         })
       }
     }

src/views/business/process/form.vue

@@ -47,11 +47,11 @@ const { form, rules } = toRefs(data)
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getProcess(id).then((res) => {
+  getProcess(id || 0).then((res) => {
+    if (res.data) {
       form.value = res.data
-    })
-  }
+    }
+  })
 }
 
 /** 取消按钮 */

src/views/business/product/form.vue

@@ -4,35 +4,25 @@
       <div class="page-container form-container">
         <!-- 功能按钮区域 -->
         <div class="form-btns-container">
-          <span class="title-label"><el-icon>
+          <span class="title-label"
+            ><el-icon>
               <Document />
-            </el-icon> 产品详情</span>
+            </el-icon>
+            产品详情</span
+          >
           <el-button-group>
             <el-button v-if="editStatus" type="primary" size="small" icon="Finished" @click="submitForm">保存</el-button>
             <el-button v-else type="warning" size="small" icon="Edit" @click="editStatus = true">编辑</el-button>
             <el-button v-if="form.id && editStatus" type="info" size="small" icon="Close" @click="editStatus = false">取消编辑</el-button>
-            <el-button v-if="form.id" type="success" size="small" @click="getForm">
-              <i class="fa fa-refresh" aria-hidden="true" /> 刷新
-            </el-button>
+            <el-button v-if="form.id" type="success" size="small" @click="getForm"> <i class="fa fa-refresh" aria-hidden="true" /> 刷新 </el-button>
           </el-button-group>
-
-          <div class="screen-btn" @click="handleScreen">
-            <template v-if="!isFullscreen">
-              <i class="fa fa-window-maximize" aria-hidden="true" />
-              <!-- <span>全屏</span> -->
-            </template>
-            <template v-else>
-              <i class="fa fa-window-restore" aria-hidden="true" />
-              <!-- <span>还原</span> -->
-            </template>
-          </div>
           <div class="close-btn" @click="cancel">
             <i class="fa fa-times" aria-hidden="true" />
             <!-- <span>关闭</span> -->
           </div>
         </div>
-          <!-- 主表 -->
-          <el-form ref="productRef" class="master-container" :model="form" :rules="rules" label-width="120px">
+        <!-- 主表 -->
+        <el-form ref="productRef" class="master-container" :model="form" :rules="rules" label-width="120px">
           <el-row :gutter="30">
             <el-col :span="6">
               <el-form-item label="料号" prop="productCode">
@@ -49,12 +39,12 @@
             <el-col :span="6">
               <el-form-item label="轴类型大类" prop="shaftBroadCategoryCode">
                 <template v-if="editStatus">
-                    <el-select v-model="form.shaftBroadCategoryCode" placeholder="请选择轴类型大类" clearable>
-                       <el-option v-for="dict in product_dtype" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                    </el-select>
+                  <el-select v-model="form.shaftBroadCategoryCode" placeholder="请选择轴类型大类" clearable>
+                    <el-option v-for="dict in product_dtype" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                  </el-select>
                 </template>
                 <template v-else>
-                  <span >{{ form.shaftBroadCategoryCode }}</span>
+                  <span>{{ form.shaftBroadCategoryCode }}</span>
                 </template>
               </el-form-item>
             </el-col>
@@ -121,36 +111,36 @@
             <el-col :span="6">
               <el-form-item label="产品状态：" prop="productStatusCode">
                 <template v-if="editStatus">
-                    <el-select v-model="form.productStatusCode" placeholder="请选择产品状态" clearable>
-                       <el-option v-for="dict in product_status_code" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                    </el-select>
+                  <el-select v-model="form.productStatusCode" placeholder="请选择产品状态" clearable>
+                    <el-option v-for="dict in product_status_code" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                  </el-select>
                 </template>
                 <template v-else>
-                  <span >{{ form.shaftBroadCategoryCode }}</span>
+                  <span>{{ form.shaftBroadCategoryCode }}</span>
                 </template>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="生产类型" prop="productionTypeCode">
                 <template v-if="editStatus">
-                    <el-select v-model="form.productionTypeCode" placeholder="请选择生产类型" clearable>
-                       <el-option v-for="dict in production_type_code" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                    </el-select>
+                  <el-select v-model="form.productionTypeCode" placeholder="请选择生产类型" clearable>
+                    <el-option v-for="dict in production_type_code" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                  </el-select>
                 </template>
                 <template v-else>
-                  <span >{{ form.productionTypeCode }}</span>
+                  <span>{{ form.productionTypeCode }}</span>
                 </template>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="类别" prop="type">
                 <template v-if="editStatus">
-                   <el-select v-model="form.type" placeholder="请选择类别">
-                      <el-option v-for="dict in product_type " :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                   </el-select>
+                  <el-select v-model="form.type" placeholder="请选择类别">
+                    <el-option v-for="dict in product_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                  </el-select>
                 </template>
                 <template v-else>
-                <span>{{ form.type }}</span>
+                  <span>{{ form.type }}</span>
                 </template>
               </el-form-item>
             </el-col>
@@ -179,11 +169,8 @@ const { production_type_code } = proxy.useDict('production_type_code')
 /** 表单抽屉 页变量 */
 const title = ref('')
 const loading = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
 const editStatus = ref(false)
-const isFullscreen = ref(false)
-const webHost = import.meta.env.VITE_APP_BASE_API
 const data = reactive({
   form: {},
   rules: {
@@ -211,22 +198,18 @@ const data = reactive({
 })
 const { form, rules } = toRefs(data)
 
-
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getProduct(id).then((response) => {
-      form.value = response.data
-      editStatus.value = false
-      title.value = '修改项目信息'
-    })
-  } else {
-    editStatus.value = true
-    title.value = '添加项目信息'
-  }
+  loading.value = true
+  getProduct(id || 0).then((res) => {
+    if (res.data) {
+      form.value = res.data
+    }
+    loading.value = false
+  })
 }
 
 /** 取消按钮 */
@@ -281,12 +264,6 @@ function reset() {
   proxy.resetForm('productRef')
 }
 
-/** 全屏缩放 */
-function handleScreen() {
-  const dom = document.querySelector('.column-container > .el-drawer__wrapper > .el-overlay')
-  isFullscreen.value = !isFullscreen.value
-  dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
-}
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs['productRef'].validate((valid) => {
@@ -308,7 +285,6 @@ function submitForm() {
   })
 }
 
-
 /** 查询表单信息  */
 function getForm() {
   loading.value = true

src/views/business/productionBatch/form.vue

@@ -9,12 +9,17 @@
               <span>{{ form.productionPlanNo }}</span>
             </el-form-item>
             <el-form-item label="当前投产批数" prop="lotNumber">
-              <el-input-number v-if="editStatus" v-model="form.lotNumber" :min="1" controls-position="right" style="width: 150px" />
-              <span v-else>{{ form.lotNumber }}</span>
+              <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 v-if="editStatus" clearable v-model="form.issuanceDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择实际开始 时间" style="width: 150px" />
-              <span v-else>{{ form.issuanceDate }}</span>
+              <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,7 +34,7 @@
       </el-form>
     </div>
     <template #footer>
-      <el-button v-if="editStatus" type="primary" icon="Finished" @click="submitForm">保存</el-button>
+      <el-button type="primary" icon="Finished" @click="submitForm">保存</el-button>
     </template>
   </el-dialog>
 </template>
@@ -52,15 +57,10 @@ const loading = ref(false)
 const ids = ref([])
 const equipmentSingle = ref(false)
 const equipmentMultiple = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
-const equipmentList = ref([])
-const processList = ref([])
-const editStatus = ref(false)
 const technologicalOptions = ref([])
 const product = ref({})
 const isFullscreen = ref(false)
-const webHost = import.meta.env.VITE_APP_BASE_API
 const data = reactive({
   form: {},
   rules: {}
@@ -71,13 +71,16 @@ const { form, rules } = toRefs(data)
 function open(row) {
   reset()
   visible.value = true
-  editStatus.value = true
+  loading.value = true
   if (row) {
     form.value = row
     listProduct({ id: form.value.productId }).then((res) => {
       product.value = res.rows[0]
       technologicalOptions.value = product.value.technologicalProcessList
+      loading.value = false
     })
+  } else {
+    loading.value = false
   }
 }
 
@@ -143,4 +146,4 @@ function handleSelectionChange(selection) {
 defineExpose({
   open
 })
-</script>
+</script>

src/views/business/resourceAllocation/form.vue

@@ -11,7 +11,7 @@
       <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane v-if="jobStatus" label="工序分配" name="process">
           <!-- 工段长表 -->
-          <section class="list-part-container" style="flex: 1;">
+          <section class="list-part-container" style="flex: 1">
             <el-form class="list-search-container" :inline="true">
               <el-form-item class="section-title" label="我的工序：" />
             </el-form>
@@ -24,13 +24,13 @@
               <el-table-column label="图纸" align="center" />
               <el-table-column v-if="!editStatus" label="操作" width="100px" align="center">
                 <template #default="scope">
-                  <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row,'formman')">取消</el-button>
+                  <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row, 'formman')">取消</el-button>
                 </template>
               </el-table-column>
             </el-table>
           </section>
           <!-- 工序库 -->
-          <section v-if="!editStatus" class="list-part-container" style="flex: 1;">
+          <section v-if="!editStatus" class="list-part-container" style="flex: 1">
             <!-- 搜索区 -->
             <el-form class="list-search-container" :model="form" ref="queryRef" :inline="true">
               <el-form-item class="section-title" label="可用工序：" />
@@ -53,10 +53,9 @@
               <el-table-column label="图纸" align="center" />
               <el-table-column label="操作" width="100px" align="center">
                 <template #default="scope">
-                  <el-button type="warning" link icon="Plus" @click="handleProcessRowClick(scope.row,'formman')">分配</el-button>
+                  <el-button type="warning" link icon="Plus" @click="handleProcessRowClick(scope.row, 'formman')">分配</el-button>
                 </template>
               </el-table-column>
-
             </el-table>
           </section>
         </el-tab-pane>
@@ -64,7 +63,7 @@
         <!-- 设备分配 -->
         <el-tab-pane label="设备分配" name="equiment">
           <!-- 工段长表 -->
-          <section class="list-part-container" style="flex: 1;">
+          <section class="list-part-container" style="flex: 1">
             <el-form class="list-search-container" :inline="true">
               <el-form-item class="section-title" label="我的设备：" />
             </el-form>
@@ -81,13 +80,13 @@
               </el-table-column>
               <el-table-column v-if="!editStatus" label="操作" width="100px" align="center">
                 <template #default="scope">
-                  <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row,'yardman')">取消</el-button>
+                  <el-button type="danger" link icon="Delete" @click="handleDelete(scope.row, 'yardman')">取消</el-button>
                 </template>
               </el-table-column>
             </el-table>
           </section>
           <!-- 工序库 -->
-          <section v-if="!editStatus" class="list-part-container" style="flex: 1;">
+          <section v-if="!editStatus" class="list-part-container" style="flex: 1">
             <!-- 搜索区 -->
             <el-form class="list-search-container" :model="form" ref="queryRef" :inline="true">
               <el-form-item class="section-title" label="可用设备：" />
@@ -114,10 +113,9 @@
               </el-table-column>
               <el-table-column label="操作" width="100px" align="center">
                 <template #default="scope">
-                  <el-button type="warning" link icon="Plus" @click="handleProcessRowClick(scope.row,'yardman')">分配</el-button>
+                  <el-button type="warning" link icon="Plus" @click="handleProcessRowClick(scope.row, 'yardman')">分配</el-button>
                 </template>
               </el-table-column>
-
             </el-table>
           </section>
         </el-tab-pane>
@@ -159,12 +157,8 @@ const queryParams = ref({})
 const ids = ref([])
 //工段长可以显示两个页面
 const jobStatus = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
 const editStatus = ref(false)
-const product = ref({})
-const isFullscreen = ref(false)
-const webHost = import.meta.env.VITE_APP_BASE_API
 /**添加一条工序资源 */
 const resourceRow = {
   processCode: '',
@@ -321,4 +315,4 @@ function restart() {
 defineExpose({
   open
 })
-</script>
+</script>

src/views/business/tenant/form.vue

@@ -1,75 +1,32 @@
 <template>
-  <el-dialog :title="title" v-model="visible" width="680px" append-to-body draggable>
+  <el-dialog title="租户信息" v-model="visible" width="680px" append-to-body draggable>
     <el-form ref="tenantRef" class="master-container" :model="form" :rules="rules" label-width="140px">
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="logo：" prop="logo">
-            <image-upload v-if="editStatus" :limit="1" :isShowTip="false" v-model="form.logo" />
-            <image-preview v-else :width="100" :height="100" :src="form.logo" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="企业全称：" prop="name">
-            <el-input v-if="editStatus" v-model="form.orgName" placeholder="请输入企业全称" />
-            <span v-else>{{ form.orgName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="统一社会信用编码：" prop="orgCrtCode">
-            <el-input v-if="editStatus" v-model="form.orgCrtCode" placeholder="请输入统一社会信用编码" />
-            <span v-else>{{ form.orgCrtCode }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="详细地址：" prop="orgAddr">
-            <el-input v-if="editStatus" v-model="form.orgAddr" placeholder="选择省市区" />
-            <span v-else>{{ form.orgAddr }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="联系人：" prop="contactName">
-            <el-input v-if="editStatus" v-model="form.contactName" placeholder="请输入联系人" />
-            <span v-else>{{ form.contactName }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="联系电话：" prop="contactPhone">
-            <el-input v-if="editStatus" v-model="form.contactPhone" placeholder="请输入联系电话" />
-            <span v-else>{{ form.contactPhone }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="10">
-        <el-col>
-          <el-form-item label="电子邮箱：" prop="contactEmail">
-            <el-input v-if="editStatus" v-model="form.contactEmail" placeholder="请输入电子邮箱" />
-            <span v-else>{{ form.contactEmail }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="logo：" prop="logo">
+        <image-upload :limit="1" :isShowTip="false" v-model="form.logo" />
+      </el-form-item>
+      <el-form-item label="企业全称：" prop="name">
+        <el-input v-model="form.orgName" placeholder="请输入企业全称" />
+      </el-form-item>
+      <el-form-item label="统一社会信用编码：" prop="orgCrtCode">
+        <el-input v-model="form.orgCrtCode" placeholder="请输入统一社会信用编码" />
+      </el-form-item>
+      <el-form-item label="详细地址：" prop="orgAddr">
+        <el-input v-model="form.orgAddr" placeholder="选择省市区" />
+      </el-form-item>
+      <el-form-item label="联系人：" prop="contactName">
+        <el-input v-model="form.contactName" placeholder="请输入联系人" />
+      </el-form-item>
+      <el-form-item label="联系电话：" prop="contactPhone">
+        <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+      </el-form-item>
+      <el-form-item label="电子邮箱：" prop="contactEmail">
+        <el-input v-model="form.contactEmail" placeholder="请输入电子邮箱" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
-        <el-button v-if="editStatus" type="primary" icon="Finished" @click="submitForm">保存</el-button>
-        <el-button v-else type="warning" icon="Edit" @click="editStatus = true">编辑</el-button>
-        <el-button v-if="form.id && editStatus" type="info" icon="Close" @click="editStatus = false">取消编辑</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" icon="Finished" @click="handleSave">保存</el-button>
+        <el-button @click="handleCancel">取 消</el-button>
       </div>
     </template>
   </el-dialog>
@@ -87,13 +44,9 @@ const props = defineProps({
 const { getList } = toRefs(props)
 /** 字典数组区 */
 /** 表单抽屉 页变量 */
-const title = ref('')
 const loading = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
 const editStatus = ref(false)
-const isFullscreen = ref(false)
-const rotationChartList = ref([])
 const data = reactive({
   form: {},
   rules: {}
@@ -104,20 +57,17 @@ const { form, rules } = toRefs(data)
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getTenant(id).then((response) => {
-      form.value = response.data
-      editStatus.value = false
-      title.value = '修改项目信息'
-    })
-  } else {
-    editStatus.value = true
-    title.value = '添加项目信息'
-  }
+  loading.value = true
+  getTenant(id || 0).then((res) => {
+    if (res.data) {
+      form.value = res.data
+    }
+    loading.value = false
+  })
 }
 
 /** 取消按钮 */
-function cancel() {
+function handleCancel() {
   visible.value = false
   reset()
 }
@@ -128,15 +78,8 @@ function reset() {
   proxy.resetForm('tenantRef')
 }
 
-/** 全屏缩放 */
-function handleScreen() {
-  const dom = document.querySelector('.column-container > .el-drawer__wrapper > .el-overlay')
-  isFullscreen.value = !isFullscreen.value
-  dom.style.position = isFullscreen.value ? 'fixed' : 'absolute'
-}
-
 /** 提交按钮 */
-function submitForm() {
+function handleSave() {
   proxy.$refs['tenantRef'].validate((valid) => {
     if (valid) {
       saveTenant(form.value).then((res) => {

src/views/business/turnover/form.vue

@@ -1,32 +1,14 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
   <div class="el-drawer__wrapper">
-    <el-drawer :title="title" v-model="visible" direction="rtl" size="100%">
+    <el-drawer title="项目信息" v-model="visible" direction="rtl" size="100%">
       <div class="page-container form-container">
         <div class="form-btns-container">
-          <span class="title-label"
-            ><el-icon>
-              <Document />
-            </el-icon>
-            项目信息</span
-          >
           <el-button-group>
-            <el-button v-if="editStatus" type="primary" icon="Finished" @click="submitForm">保存</el-button>
-            <el-button v-else type="warning" icon="Edit" @click="editStatus = true">编辑</el-button>
-            <el-button v-if="form.id && editStatus" type="info" icon="Close" @click="editStatus = false">取消编辑</el-button>
+            <el-button type="primary" icon="Finished" @click="handleSave">保存</el-button>
             <el-button v-if="form.id" type="success" @click="getForm"> <i class="fa fa-refresh" aria-hidden="true" /> 刷新 </el-button>
           </el-button-group>
-          <div class="screen-btn" @click="handleScreen">
-            <template v-if="!isFullscreen">
-              <i class="fa fa-window-maximize" aria-hidden="true" />
-              <!-- <span>全屏</span> -->
-            </template>
-            <template v-else>
-              <i class="fa fa-window-restore" aria-hidden="true" />
-              <!-- <span>还原</span> -->
-            </template>
-          </div>
-          <div class="close-btn" @click="cancel">
+          <div class="close-btn" @click="handleCancel">
             <i class="fa fa-times" aria-hidden="true" />
             <!-- <span>关闭</span> -->
           </div>
@@ -36,26 +18,22 @@
           <el-row :gutter="30">
             <el-col :span="6">
               <el-form-item label="设备类别编号" prop="code">
-                <el-input v-if="editStatus" v-model="form.code" placeholder="请输入设备类别编号" />
-                <span v-else>{{ form.code }}</span>
+                <el-input v-model="form.code" placeholder="请输入设备类别编号" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别名称" prop="name">
-                <el-input v-if="editStatus" v-model="form.name" placeholder="请输入设备类别名称" />
-                <span v-else>{{ form.name }}</span>
+                <el-input v-model="form.name" placeholder="请输入设备类别名称" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别描述" prop="remark">
-                <el-input v-if="editStatus" v-model="form.remark" placeholder="请输入设备类别描述" />
-                <span v-else>{{ form.remark }}</span>
+                <el-input v-model="form.remark" placeholder="请输入设备类别描述" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="设备类别排序" prop="sort">
-                <el-input v-if="editStatus" v-model="form.sort" placeholder="请输入设备类别排序" />
-                <span v-else>{{ form.sort }}</span>
+                <el-input v-model="form.sort" placeholder="请输入设备类别排序" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -77,13 +55,9 @@ const props = defineProps({
 const { getList } = toRefs(props)
 /** 字典数组区 */
 /** 表单抽屉 页变量 */
-const title = ref('')
 const loading = ref(false)
-const multiple = ref(true)
 const visible = ref(false)
-const editStatus = ref(false)
 const isFullscreen = ref(false)
-const webHost = import.meta.env.VITE_APP_BASE_API
 const data = reactive({
   form: {},
   rules: {
@@ -98,20 +72,17 @@ const { form, rules } = toRefs(data)
 function open(id) {
   reset()
   visible.value = true
-  if (id) {
-    getTurnover(id).then((response) => {
-      form.value = response.data
-      editStatus.value = false
-      title.value = '修改项目信息'
-    })
-  } else {
-    editStatus.value = true
-    title.value = '添加项目信息'
-  }
+  loading.value = true
+  getTurnover(id).then((res) => {
+    if (res.data) {
+      form.value = res.data
+      loading.value = false
+    }
+  })
 }
 
 /** 取消按钮 */
-function cancel() {
+function handleCancel() {
   visible.value = false
   reset()
 }
@@ -145,7 +116,7 @@ function handleScreen() {
 }
 
 /** 提交按钮 */
-function submitForm() {
+function handleSave() {
   proxy.$refs['turnoverRef'].validate((valid) => {
     if (valid) {
       if (form.value.id != null) {

src/views/business/turnover/index.vue

@@ -69,7 +69,7 @@
 <script setup name="Process">
 import { listProcess, delProcess } from '@/api/business/process'
 const { proxy } = getCurrentInstance()
-const { vehicle_status } = proxy.useDict('vehicle_status')
+const { carrier_status } = proxy.useDict('carrier_status')
 
 /** 查询 对象 */
 const vehicleCategoryList = ref([

src/views/dialog/equipment.vue

@@ -83,7 +83,6 @@ const { queryParams } = toRefs(data)
  */
 function open() {
   visible.value = true
-  console.log(1111)
   getList()
 }