Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/api/business/carrier.js

@@ -73,6 +73,14 @@ export function saveCarrier(data) {
   })
 }
 
+export function updateCarrier(data) {
+  return request({
+    url: baseUrl + '/business/carrier/update',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除载具管理
 export function delCarrier(id) {
   return request({

src/views/business/carrier/form.vue

@@ -2,12 +2,19 @@
   <!-- 添加或修改项目信息对话框 -->
   <el-dialog title="载具信息表单" v-model="visible" width="400px" append-to-body draggable>
     <div class="form-container">
-      <el-form ref="carrierFormRef" class="master-container" :rules="rules" v-loading="loading" :model="form" label-width="80px">
-        <el-form-item label="载具编号" prop="code" required>
-          <el-input v-model.trim="form.code" placeholder="请输入载具编号" />
+      <el-form ref="carrierFormRef" class="master-container" :rules="rules" v-loading="loading" :model="form"
+               label-width="80px">
+        <!--        <el-form-item label="载具编号" prop="code" required>-->
+        <!--          <el-input v-model.trim="form.code" placeholder="请输入载具编号" />-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否多批" prop="status">
+          <el-select v-model="form.isAllowMore">
+            <el-option v-for="item in is_allow_more" :key="item.value" :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model.trim="form.remark" placeholder="请输入备注" />
+          <el-input v-model.trim="form.remark" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
     </div>
@@ -18,15 +25,17 @@
   </el-dialog>
 </template>
 <script setup>
-import { getCarrier, saveCarrier } from '@/api/business/carrier'
-const { proxy } = getCurrentInstance()
+import {getCarrier, saveCarrier, updateCarrier} from '@/api/business/carrier'
+
+const {proxy} = getCurrentInstance()
+const {is_allow_more} = proxy.useDict('is_allow_more')
 const emit = defineEmits(['handleSaveSuccess'])
 
 const loading = ref(false)
 const visible = ref(false)
 const form = ref({})
 const rules = {
-  code: [{ required: true, message: '载具编号不能为空', trigger: 'blur' }]
+  code: [{required: true, message: '载具编号不能为空', trigger: 'blur'}]
 }
 
 /***********************  方法区  ****************************/
@@ -38,7 +47,8 @@ const open = (data) => {
   form.value.categoryId = data.categoryId
   getCarrier(data.id || 0).then((res) => {
     if (res.data) {
-      form.value = res.data
+      form.value = res.data;
+      form.value.isAllowMore = form.value.isAllowMore + '';
     }
     loading.value = false
   })
@@ -57,19 +67,19 @@ const reset = () => {
 
 /** 提交按钮 */
 const handleSave = () => {
- proxy.$refs['carrierFormRef'].validate((valid) => {
+  proxy.$refs['carrierFormRef'].validate((valid) => {
     if (valid) {
-        saveCarrier(form.value).then((res) => {
-    if (res.code === 601) {
-      proxy.$modal.msgWarn(res.msg)
-      return
-    }
-    if (res.code === 200) {
-      proxy.$modal.msgSuccess('操作成功')
-      emit('handleSaveSuccess')
-    }
-    visible.value = false
-  })
+      updateCarrier(form.value).then((res) => {
+        if (res.code === 601) {
+          proxy.$modal.msgWarn(res.msg)
+          return
+        }
+        if (res.code === 200) {
+          proxy.$modal.msgSuccess('操作成功')
+          emit('handleSaveSuccess')
+        }
+        visible.value = false
+      })
     }
   })
 }

src/views/business/carrier/index.vue

@@ -73,10 +73,16 @@
             <el-table-column type="selection" width="40" align="center" :reserve-selection="true" />
             <el-table-column type="index" label="行号" width="50" align="center" />
             <el-table-column prop="code" label="载具编号" width="80" align="center" />
-            <el-table-column label="状态" width="120" prop="isAbandoned" align="center">
+            <el-table-column label="状态" width="80" prop="isAbandoned" align="center">
               <template #default="scope">
                 {{ scope.row.status }}
-                <dict-tag :options="carrier_status" :value="scope.row.isAbandoned" />
+                <dict-tag :options="carrier_status"  :value="scope.row.isAbandoned" />
+              </template>
+            </el-table-column>
+            <el-table-column label="是否多批" width="80" prop="isAllowMore" align="center">
+              <template #default="scope">
+                {{ scope.row.status }}
+                <dict-tag :options="is_allow_more" :value="scope.row.isAllowMore" />
               </template>
             </el-table-column>
             <el-table-column prop="createTime" label="添加日期" width="130" align="center">
@@ -99,11 +105,11 @@
                 {{ scope.row.abandonmentReason ? scope.row.abandonmentReason : '-' }}
               </template>
             </el-table-column> -->
-            <el-table-column label="操作" width="100" align="center">
+            <el-table-column label="操作" width="180" align="center">
               <template #default="scope">
-                <!-- <el-button link type="warning" icon="Edit" @click="handleShowCarrierDialog(scope.row.id)" v-hasPermi="['business:carrier:edit']">
+                <el-button link type="warning" icon="Edit" @click="handleShowCarrierDialog(scope.row.id)" v-hasPermi="['business:carrier:edit']">
                   编辑
-                </el-button> -->
+                </el-button>
                 <el-button v-if="scope.row.isAbandoned === 0" link type="danger" icon="Delete" @click="handleShowAbandonDialog(scope.row.id)" v-hasPermi="['business:carrier:abandonment']">废弃</el-button>
                 <el-button v-else link type="success" icon="CircleCheck" @click="handleUnAbandoned(scope.row)" v-hasPermi="['business:carrier:unAbandonment']">取消废弃</el-button>
               </template>
@@ -137,6 +143,7 @@ import JSZip from 'jszip';
 import { saveAs } from 'file-saver';
 const { proxy } = getCurrentInstance()
 const { carrier_status } = proxy.useDict('carrier_status')
+const { is_allow_more } = proxy.useDict('is_allow_more')
 const webHost = import.meta.env.VITE_APP_PRODUCTION_API
 const categoryTable = ref(null)
 const carrierCategoryList = ref([])

src/views/business/workshop/form.vue

@@ -1,36 +1,38 @@
 <template>
   <!-- 添加或修改项目信息对话框 -->
   <el-dialog
-    title="车间信息"
-    v-model="visible"
-    width="400px"
-    append-to-body
-    draggable
+      title="车间信息"
+      v-model="visible"
+      width="400px"
+      append-to-body
+      draggable
   >
     <div class="form-container">
       <el-form
-        ref="workshopRef"
-        class="master-container"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
+          ref="workshopRef"
+          class="master-container"
+          :model="form"
+          :rules="rules"
+          label-width="100px"
       >
         <el-form-item label="车间名称" prop="name">
-          <el-input v-model.trim="form.name" placeholder="请输入车间名称" />
+          <el-input v-model.trim="form.name" placeholder="请输入车间名称"/>
         </el-form-item>
       </el-form>
     </div>
     <template #footer>
       <el-button type="primary" icon="Check" @click="submitForm"
-        >确 定</el-button
+      >确 定
+      </el-button
       >
       <el-button icon="Close" @click="cancel">取 消</el-button>
     </template>
   </el-dialog>
 </template>
-  <script setup>
-import { getWorkshop,addWorkshop,updateWorkshop } from "@/api/business/workshop";
-const { proxy } = getCurrentInstance();
+<script setup>
+import {getWorkshop, addWorkshop, updateWorkshop} from "@/api/business/workshop";
+
+const {proxy} = getCurrentInstance();
 const emit = defineEmits(["handleSaveSuccess"]);
 /** 字典数组区 */
 /** 表单抽屉 页变量 */
@@ -40,11 +42,12 @@ const data = reactive({
   form: {},
   rules: {
     name: [
-      { required: true, message: "车间名称不能为空", trigger: "blur" },
+      {required: true, message: "车间名称不能为空", trigger: "blur"},
     ]
   },
 });
-const { form, rules } = toRefs(data);
+const {form, rules} = toRefs(data);
+
 /***********************  方法区  ****************************/
 /** 打开抽屉 */
 function open(row) {
@@ -56,6 +59,7 @@ function open(row) {
     });
   }
 }
+
 /** 取消按钮 */
 function cancel() {
   visible.value = false;
@@ -76,24 +80,23 @@ function reset() {
 function submitForm() {
   proxy.$refs["workshopRef"].validate((valid) => {
     if (valid) {
-        if(form.value.id) {
+      if (form.value.id) {
         updateWorkshop(form.value).then((res) => {
-        if (res.code === 200) {
-          proxy.$modal.msgSuccess("保存成功");
-          emit("handleSaveSuccess");
-          visible.value = false;
-        }
-      });
-    }
-    else {
+          if (res.code === 200) {
+            proxy.$modal.msgSuccess("保存成功");
+            emit("handleSaveSuccess");
+            visible.value = false;
+          }
+        });
+      } else {
         addWorkshop(form.value).then((res) => {
-        if (res.code === 200) {
-          proxy.$modal.msgSuccess("添加成功");
-          emit("handleSaveSuccess");
-          visible.value = false;
-        }
-      });
-    }
+          if (res.code === 200) {
+            proxy.$modal.msgSuccess("添加成功");
+            emit("handleSaveSuccess");
+            visible.value = false;
+          }
+        });
+      }
     }
   });
 }

src/views/dialog/person.vue

@@ -41,6 +41,8 @@
 import { ref } from '@vue/reactivity'
 import { listEmployee } from '@/api/system/user'
 import { listUser,listByLikeNickNameOrUserName, getUsersByDeptId, getUsersItemByDeptId } from '@/api/system/user'
+
+
 const { proxy } = getCurrentInstance()
 const total = ref(0)
 const props = defineProps({