提交

src/views/business/equipment/formDetail.vue

@@ -4,8 +4,8 @@
       <el-form ref="formDetailRef" v-loading="loading" class="master-container" :model="form" :rules="rules"
         label-width="80px">
         <el-form-item label="设备类别" prop="equipmentCategoryId">
-          <el-select-v2 v-model="form.equipmentCategoryId"  filterable :options="parentCategories"
-            placeholder="设备类别" style="width: 220px" />
+          <el-select-v2 v-model="form.equipmentCategoryId" filterable :options="parentCategories" placeholder="设备类别"
+            style="width: 220px" />
         </el-form-item>
         <el-form-item label="设备编码" prop="equipmentCode">
           <el-input v-model.trim="form.equipmentCode" placeholder="请输入设备编码" />
@@ -53,7 +53,7 @@
   </el-dialog>
 </template>
 <script setup>
-import { getDetails, saveDetails ,listCategories} from '@/api/business/equipment'
+import { getDetails, saveDetails, listCategories } from '@/api/business/equipment'
 import selectDeptDialog from '@/components/Dialog/Department'
 const emit = defineEmits(['handleSaveSuccess'])
 const { proxy } = getCurrentInstance()
@@ -69,8 +69,12 @@ const equipmentCodeIds = ref([])
 const data = reactive({
   form: {},
   rules: {
-    equipmentCategoryId:[{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
-    equipmentCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
+    equipmentCategoryId: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
+    equipmentCode: [
+      { required: true, message: '设备编码不能为空', trigger: 'blur' },
+      {
+        message: '设备编码不能包含 , % / 这种特殊字符', trigger: 'blur', validator: equipmentCodeValidator
+      }],
     equipmentName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
     usageDeptAlias: [{ required: true, message: '使用部门不能为空', trigger: 'change' }],
     belongingDeptAlias: [{ required: true, message: '归属部门不能为空', trigger: 'change' }],
@@ -95,6 +99,12 @@ const open = (data) => {
   getCategoryList()
 }
 
+function equipmentCodeValidator(rule, value) {
+  // console.log(rule)
+  const reg = /^[^%,/]+$/
+  return reg.test(value)
+}
+
 function getCategoryList() {
   listCategories({}).then(res => {
     if (res.code == 200) {

src/views/business/firstOutsource/DialogFurnaceNoInfo.vue

@@ -22,6 +22,8 @@
       <el-table-column label="形状" align="center" prop="shape" />
       <el-table-column label="来料日期" align="center" prop="incomingDate" />
       <el-table-column label="原料编码" align="center" prop="rawMaterialCode" />
+      <el-table-column label="技术要求1" align="center" prop="firstTechnicalRequirement" />
+      <el-table-column label="技术要求2" align="center" prop="secondTechnicalRequirement" />
       <el-table-column label="操作" align="center" prop="rawMaterialCode">
         <template #default="scope">
           <el-button type="success" icon="finished" circle @click="handleSingleSelected(scope.row)" />

src/views/business/firstOutsource/DialogProducts.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog title="添加产品" v-model="visible" width="800px" height="400px" @close="close" append-to-body draggable>
     <el-form ref="dialogForm" :model="queryParams" :inline="true" style="padding-top: 16px">
-      <el-form-item label="关键字：" prop="productDescription" label-width="104">
+      <el-form-item label="关键字：" prop="keyword" label-width="104">
         <el-input v-model.trim="queryParams.keyword" type="text" @keydown.enter.prevent style="width: 170px"
           placeholder="请输入批号或产品描述" :clearable="true" @keyup.enter="handleSearch" />
       </el-form-item>
@@ -19,8 +19,9 @@
       <el-table-column type="selection" width="40" align="center" />
       <el-table-column type="index" label="行号" width="50" align="center" />
       <el-table-column label="生产计划单号" align="center" prop="productionPlanNo" width="96" />
+      <el-table-column label="序号" align="center" prop="lineNumber" width="40" />
       <el-table-column label="产品描述" align="center" prop="productDescription" />
-      <el-table-column label="批数" align="center" prop="lotTotalNumber" width="96" />
+      <el-table-column label="批数" align="center" prop="firstRemain" width="96" />
       <el-table-column label="单批量" align="center" prop="oneLotQuantity" width="96" />
     </el-table>
     <!-- 分页 -->

src/views/business/firstOutsource/DialogSuppliers.vue

@@ -1,86 +1,34 @@
 <template>
-  <el-dialog
-    title="添加外协商"
-    v-model="visible"
-    width="800px"
-    height="400px"
-    @close="close"
-    append-to-body
-    draggable
-  >
-    <el-form
-      ref="dialogForm"
-      class="master-container"
-      :model="queryParams"
-      :inline="true"
-      style="align-items: center"
-    >
+  <el-dialog title="添加外协商" v-model="visible" width="800px" height="400px" @close="close" append-to-body draggable>
+    <el-form ref="dialogForm" class="master-container" :model="queryParams" :inline="true" style="align-items: center">
       <div style="display: flex">
         <el-form-item label="外协商名称：" prop="name">
-          <el-input
-            v-model.trim="queryParams.name"
-            type="text"
-            @keydown.enter.prevent
-            style="width: 120px"
-            placeholder="请输入关键字"
-            :clearable="true"
-            @keyup.enter="handleSearch"
-          />
+          <el-input v-model.trim="queryParams.name" type="text" @keydown.enter.prevent style="width: 120px"
+            placeholder="请输入关键字" :clearable="true" @keyup.enter="handleSearch" />
         </el-form-item>
         <el-form-item label="助记码：" prop="name">
-          <el-input
-            v-model.trim="queryParams.mnemonicCode"
-            type="text"
-            @keydown.enter.prevent
-            style="width: 120px"
-            placeholder="请输入关键字"
-            :clearable="true"
-            @keyup.enter="handleSearch"
-          />
+          <el-input v-model.trim="queryParams.mnemonicCode" type="text" @keydown.enter.prevent style="width: 120px"
+            placeholder="请输入关键字" :clearable="true" @keyup.enter="handleSearch" />
         </el-form-item>
         <el-form-item>
-          <el-button type="info" icon="Search" @click="handleSearch"
-            >搜索</el-button
-          >
+          <el-button type="info" icon="Search" @click="handleSearch">搜索</el-button>
         </el-form-item>
       </div>
     </el-form>
 
-    <el-table
-      ref="dialogTable"
-      :data="dataList"
-      size="small"
-      v-loading="loading"
-      border
-      height="370px"
-    >
+    <el-table ref="dialogTable" :data="dataList" size="small" v-loading="loading" border height="370px">
       <el-table-column type="index" label="行号" width="50" align="center" />
       <el-table-column label="外协商名称" align="center" prop="name" />
-      <el-table-column
-        label="助记码"
-        align="center"
-        prop="mnemonicCode"
-        width="120"
-      />
+      <el-table-column label="助记码" align="center" prop="mnemonicCode" width="120" />
       <el-table-column label="操作" width="64" align="center">
         <template #default="scope">
-          <el-button
-            type="success"
-            icon="finished"
-            circle
-            @click="handleSingleSelected(scope.row)"
-          />
+          <el-button type="success" icon="finished" circle @click="handleSingleSelected(scope.row)" />
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
   </el-dialog>
 </template>
 <script setup>
@@ -94,8 +42,8 @@ const props = defineProps({
   singleSelected: {
     type: Function,
     default: null,
-  },
-});
+  }
+})
 
 const { singleSelected } = toRefs(props);
 const dataList = ref([]);

src/views/business/firstOutsource/form.vue

@@ -11,9 +11,9 @@
         </span>
 
         <el-button v-show="editStatus && form.isSubmit == 1" type="primary" icon="Download" @click="handleExport"
-          v-hasPermi="['business:outsource:export']">导出</el-button>
+          v-hasPermi="['business:firstOutsource:export']">导出</el-button>
         <el-button v-show="editStatus && form.isSubmit == 1" type="warning" icon="Download" @click="handlePrint"
-          v-hasPermi="['business:outsource:export']">
+          v-hasPermi="['business:firstOutsource:export']">
           打印
         </el-button>
         <el-button v-if="editStatus" type="primary" icon="Finished" @click="handleSubmit">保存</el-button>
@@ -112,7 +112,7 @@
       <!-- 渲染数据区 -->
       <div class="form-details-btns-container">
         <el-button v-show="editStatus" type="primary" icon="Plus" @click="handleShowDialogProducts"
-          v-hasPermi="['business:outsource:add']">
+          v-hasPermi="['business:firstOutsource:add']">
           添加外协产品明细
         </el-button>
         <el-button v-show="editStatus" type="primary" icon="Plus" @click="handleChoiceFurnaceNoInfo()">
@@ -132,7 +132,7 @@
             <el-table-column label="箱数" align="center" prop="newCarrierCount" width="100">
               <template #default="scope">
                 <el-input-number v-if="editStatus && scope.row.hasReturnReceiptDetailFlag" :min="0"
-                  v-model="scope.row.newCarrierCount" :controls="false" placeholder="箱数"
+                  v-model="scope.row.newCarrierCount" :step="1" step-strictly :controls="false" placeholder="箱数"
                   @blur="handleCarrierNumChange" />
                 <span v-else>{{ scope.row.newCarrierCount }}</span>
               </template>
@@ -168,7 +168,7 @@
               width="64">
               <template #default="scope">
                 <el-button circle type="danger" v-if="scope.row.hasReturnReceiptDetailFlag" icon="Delete"
-                  @click="handleDelete(scope.$index)" v-hasPermi="['business:outsource:remove']" />
+                  @click="handleDelete(scope.$index)" v-hasPermi="['business:firstOutsource:remove']" />
               </template>
             </el-table-column>
           </el-table>
@@ -374,7 +374,8 @@ const handleDelete = (index) => {
   } else {
     form.value.freightAmount = 0.0;
   }
-  form.value.details.splice(index, 1);
+  form.value.details.splice(index, 1)
+  handleCarrierNumChange()
 };
 
 /** 表单重置 */
@@ -503,6 +504,10 @@ function handleSubmit() {
             proxy.$modal.msgError("请选择" + unfurnace.lotCode + "批次的炉号")
             return
           }
+          if (totalCarriersNum.value == null || totalCarriersNum.value == 0) {
+            proxy.$modal.msgError("请输入箱数")
+            return
+          }
           if (valid) {
             console.log(form.value)
             submitDetailsOnFirst(form.value).then((response) => {
@@ -526,22 +531,16 @@ function handleSubmit() {
           return;
         }
       }
-      if (form.value.packagingMethod == 1) {
-        console.log("form.value.details", form.value.details);
-        for (const item of form.value.details) {
-          if (item.newCarriers.length == 0) {
-            proxy.$modal.msgError("请选择" + item.lotCode + "批次的新箱号");
-            return;
-          }
-        }
-      }
-
       // 判断是否有批次没有炉号
       const unfurnace = form.value.details.find(v => v.furnaceNoInfo == null)
       if (unfurnace != null) {
         proxy.$modal.msgError("请选择" + unfurnace.lotCode + "批次的炉号")
         return
       }
+      if (totalCarriersNum.value == null || totalCarriersNum.value == 0) {
+        proxy.$modal.msgError("请输入箱数")
+        return
+      }
       if (valid) {
         console.log(form.value)
         submitDetailsOnFirst(form.value).then((response) => {

src/views/business/firstOutsource/index.vue

@@ -34,19 +34,19 @@
 
     <!-- 功能按钮区 -->
     <div class="list-btns-container">
-      <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['business:outsource:add']">
+      <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['business:firstOutsource:add']">
         新增
       </el-button>
       <el-button type="danger" icon="Delete" :disabled="multiple" @click="handleDelete"
-        v-hasPermi="['business:outsource:remove']">
+        v-hasPermi="['business:firstOutsource:remove']">
         删除
       </el-button>
       <el-button type="warning" icon="Download" :disabled="ids.length != 1" @click="handleExport"
-        v-hasPermi="['business:outsource:export']">
+        v-hasPermi="['business:firstOutsource:export']">
         导出
       </el-button>
       <el-button type="warning" icon="Download" :disabled="ids.length != 1" @click="handlePrint"
-        v-hasPermi="['business:outsource:export']">
+        v-hasPermi="['business:firstOutsource:export']">
         打印
       </el-button>
     </div>
@@ -83,15 +83,15 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template #default="scope">
               <el-button v-if="scope.row.isSubmit == 1" link type="warning" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['business:outsource:edit']">
+                v-hasPermi="['business:firstOutsource:edit']">
                 编辑
               </el-button>
               <el-button link type="primary" icon="View" @click="handleView(scope.row)"
-                v-hasPermi="['business:outsource:query']">
+                v-hasPermi="['business:firstOutsource:query']">
                 查看
               </el-button>
               <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['business:outsource:remove']">
+                v-hasPermi="['business:firstOutsource:remove']">
                 删除
               </el-button>
             </template>

src/views/business/returnTurnover/index.vue

@@ -2,10 +2,10 @@
 	<div class="page-container column-container">
 		<!-- 搜索区 -->
 		<el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" style="margin-right: 0px">
-			<el-form-item label="单据号：" prop="formCode">
+			<!-- <el-form-item label="单据号：" prop="formCode">
 				<el-input v-model="queryParams.formCode" placeholder="请输入单据号" style="width: 144px" clearable
 					@keyup.enter="handleQuery" />
-			</el-form-item>
+			</el-form-item> -->
 			<el-form-item label="批次号：" prop="lotCode">
 				<el-input v-model="queryParams.lotCode" placeholder="请输入批次号" style="width: 144px" clearable
 					@keyup.enter="handleQuery" />

src/views/business/workshop/index.vue

@@ -6,17 +6,11 @@
       <el-form class="list-search-container" :model="queryDeptParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="车间管理" />
         <el-form-item>
-          <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
+          <el-button v-hasPermi="['business:workshop:add']" type="primary" icon="Plus" @click="handleAdd">新增</el-button>
         </el-form-item>
         <el-form-item label="车间名称：" prop="name">
-          <el-input
-            v-model.trim="queryParams.name"
-            placeholder="请输入车间名称"
-            @keydown.enter.prevent
-            @keyup.enter="handleSearch"
-            clearable
-            style="width: 155px"
-          />
+          <el-input v-model.trim="queryParams.name" placeholder="请输入车间名称" @keydown.enter.prevent
+            @keyup.enter="handleSearch" clearable style="width: 155px" />
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" @click="handleSearch">搜索</el-button>
@@ -26,23 +20,16 @@
       <div class="el-table-container">
         <div class="el-table-inner-container">
           <!-- 列表区 -->
-          <el-table
-            ref="workshopTable"
-            v-loading="loading"
-            :data="workshopList"
-            row-key="id"
-            height="100%"
-            :indent="20"
-            default-expand-all
-            highlight-current-row
-            @current-change="handleGetDept"
-          >
+          <el-table ref="workshopTable" v-loading="loading" :data="workshopList" row-key="id" height="100%" :indent="20"
+            default-expand-all highlight-current-row @current-change="handleGetDept">
             <el-table-column label="行号" type="index" width="50" align="center" />
             <el-table-column label="车间名称" prop="name" align="center" />
             <el-table-column label="操作" width="150" align="center">
               <template #default="scope">
-                <el-button link type="warning" icon="Edit" @click="handleUpdateWorkshop(scope.row)">编辑</el-button>
-                <el-button link type="danger" icon="Delete" @click="handleDeleteWorkshop(scope.row)">删除</el-button>
+                <el-button v-hasPermi="['business:workshop:edit']" link type="warning" icon="Edit"
+                  @click="handleUpdateWorkshop(scope.row)">编辑</el-button>
+                <el-button v-hasPermi="['business:workshop:remove']" link type="danger" icon="Delete"
+                  @click="handleDeleteWorkshop(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -58,15 +45,18 @@
         <el-form class="list-search-container" :model="queryDeptParams" ref="queryRef" :inline="true">
           <el-form-item class="section-title" label="工段" />
           <el-form-item>
-            <el-button type="primary" icon="Plus" :disabled="workshopList.length == 0" @click="handleAddDept">新增</el-button>
-            <el-button type="danger" icon="Delete" :disabled="ids.length == 0" @click="handleDeptDelete"> 删除</el-button>
+            <el-button v-hasPermi="['business:workshop:add']" type="primary" icon="Plus"
+              :disabled="workshopList.length == 0" @click="handleAddDept">新增</el-button>
+            <el-button v-hasPermi="['business:workshop:remove']" type="danger" icon="Delete" :disabled="ids.length == 0"
+              @click="handleDeptDelete"> 删除</el-button>
           </el-form-item>
         </el-form>
 
         <!-- 列表区 -->
         <div class="el-table-container">
           <div class="el-table-inner-container">
-            <el-table v-loading="deptLoading" :data="deptList" :row-key="getRowKey" height="100%" @selection-change="handleSelectionChange">
+            <el-table v-loading="deptLoading" :data="deptList" :row-key="getRowKey" height="100%"
+              @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="40" align="center" />
               <el-table-column type="index" label="行号" width="50" align="center" />
               <el-table-column label="工段名称" prop="deptName" align="center" />
@@ -75,13 +65,8 @@
           </div>
         </div>
         <!-- 分页 -->
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          v-model:page="queryDeptParams.pageNum"
-          v-model:limit="queryDeptParams.pageSize"
-          @pagination="getDeptList"
-        />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryDeptParams.pageNum"
+          v-model:limit="queryDeptParams.pageSize" @pagination="getDeptList" />
       </section>
       <!-- 周转区 -->
       <section class="list-part-container column-container" style="flex: 1">
@@ -89,7 +74,8 @@
         <el-form class="list-search-container" :model="queryDeptParams" ref="queryRef" :inline="true">
           <el-form-item class="section-title" label="周转区" />
           <el-form-item>
-            <el-button type="primary" icon="Plus" @click="handleShowTurnoverFormDialog(null)">新增</el-button>
+            <el-button v-hasPermi="['business:workshop:add']" type="primary" icon="Plus"
+              @click="handleShowTurnoverFormDialog(null)">新增</el-button>
           </el-form-item>
         </el-form>
 
@@ -107,8 +93,11 @@
               <el-table-column label="备注" prop="remark" align="center" />
               <el-table-column label="操作" width="150" align="center">
                 <template #default="scope">
-                  <el-button link type="warning" icon="Edit" @click="handleShowTurnoverFormDialog(scope.row.id)"> 编辑 </el-button>
-                  <el-button link type="danger" icon="Delete" @click="handleDeleteTurnover(scope.row)"> 删除 </el-button>
+                  <el-button v-hasPermi="['business:workshop:edit']" link type="warning" icon="Edit"
+                    @click="handleShowTurnoverFormDialog(scope.row.id)"> 编辑
+                  </el-button>
+                  <el-button v-hasPermi="['business:workshop:remove']" link type="danger" icon="Delete"
+                    @click="handleDeleteTurnover(scope.row)"> 删除 </el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -217,7 +206,7 @@ function handleDeleteWorkshop(row) {
       getList()
       proxy.$modal.msgSuccess('删除成功！')
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 /***********************  工段相关事件  ****************************/
 //打开添加工段
@@ -320,7 +309,7 @@ function handleDeleteTurnover(row) {
       getTurnovers()
       proxy.$modal.msgSuccess('删除成功！')
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
 onMounted(() => {