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

src/components/Dialog/Department/index.vue

@@ -70,7 +70,7 @@ const open = (data) => {
 const loadData = () => {
   loading.value = true
   listDept(queryParams.value).then((res) => {
-    dataList.value = res.data
+    dataList.value = res.rows
     //dataTotal.value = res.total
     loading.value = false
   })

src/layout/components/Navbar.vue

@@ -7,13 +7,13 @@
     <div class="right-menu">
       <div style="color: #fff; padding-right: 16px; font-size: 14px">
         <span>当前厂别：</span>
-        <!-- <template v-if="currentTenantName!='超级管理员'">
+        <template v-if="currentTenantName!='超级管理员'">
              <span style="cursor: pointer"  @click="handleShowTenantDialog">{{ currentTenantName }}</span>
         </template>
         <template v-else>
           <span style="cursor: pointer"  >{{ currentTenantName }}</span>
-        </template> -->
-        <span style="cursor: pointer"  @click="handleShowTenantDialog">{{ currentTenantName }}</span>
+        </template>
+        <!-- <span style="cursor: pointer"  @click="handleShowTenantDialog">{{ currentTenantName }}</span> -->
       </div>
       <template v-if="appStore.device !== 'mobile'">
         <!--

src/views/business/carrier/index.vue

@@ -6,7 +6,7 @@
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="载具类别" />
         <el-form-item>
-          <el-button type="success" icon="Refresh" @click="handleQueryCategory">刷新</el-button>
+          <!-- <el-button type="success" icon="Refresh" @click="handleQueryCategory">刷新</el-button> -->
           <el-button type="primary" icon="Plus" @click="handleShowCategoryDialog(null)" v-hasPermi="['business:carrier:add']">新增</el-button>
         </el-form-item>
       </el-form>
@@ -60,7 +60,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="info" icon="Search" @click="handleQueryCarrier">搜索</el-button>
-          <el-button type="success" icon="Refresh" @click="handleRefreshCarrier">刷新</el-button>
+          <!-- <el-button type="success" icon="Refresh" @click="handleRefreshCarrier">刷新</el-button> -->
           <!-- <el-button type="primary" icon="Plus" @click="handleShowCarrierDialog(null)" v-hasPermi="['business:carrier:add']">新增</el-button> -->
           <el-button :disabled="selections.length == 0" type="warning" icon="Download" @click="handleBatchDownloadQrCode">批量下载二维码</el-button>
         </el-form-item>

src/views/business/daywork/form.vue

@@ -378,6 +378,7 @@ const open = (row) => {
   reset();
   loading.value = true;
   if (row.id) {
+    //页面操作是编辑还是删除
     editStatus.value = row.editStatus;
     detailInfo.value = proxy.deepClone(row);
     //是否是当前工序

src/views/business/daywork/index.vue

@@ -72,7 +72,8 @@
             </el-table-column>
             <el-table-column fixed="right" label="操作" align="center" width="70px">
               <template #default="scope">
-                <el-button link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑</el-button>
+                <el-button v-if="scope.row.status ==2 || scope.row.status == 3" link type="warning" icon="Edit" @click="handleUpdateDayworkItem(scope.row)">编辑</el-button>
+                <el-button v-else link type="primary" icon="View" @click="handleCheckDayworkItem(scope.row)">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -162,6 +163,7 @@ function getDayworks() {
     }
   })
 }
+//查询报工信息数据
 function handleGetDayworkItems() {
   dayworkLoading.value = true
   listDaywork(queryDayworkParams.value).then((res) => {
@@ -187,10 +189,11 @@ function handleGetDayworkItems() {
     proxy.$refs.dayworkTable.setCurrentRow(dayworkList.value[index])
   })
 }
+//切换工段
 function handleDeptChange() {
   getDayworks()
 }
-
+//修改
 function handleUpdateDayworkItem(row) {
   row.technologicalProcessId = queryItemParams.value.technologicalProcessId
   row.deptId = queryDayworkParams.value.deptId
@@ -203,6 +206,25 @@ function handleUpdateDayworkItem(row) {
   } else {
     row.currentDept = false
   }
+  //修改向form表单传一个状态值
+  row.editStatus = true
+  proxy.$refs.dayworkItemRef.open(row)
+}
+//查看
+function handleCheckDayworkItem(row) {
+  row.technologicalProcessId = queryItemParams.value.technologicalProcessId
+  row.deptId = queryDayworkParams.value.deptId
+  row.productionPlanDetailId = currentDaywork.value.productionPlanDetailId
+  row.dayworkId = currentDaywork.value.id
+  row.lotId = currentDaywork.value.lotId
+  //判断是否是当前工段
+  if (row.deptId == currentDaywork.value.deptId) {
+    row.currentDept = true
+  } else {
+    row.currentDept = false
+  }
+  //修改向form表单传一个状态值
+  row.editStatus = false
   proxy.$refs.dayworkItemRef.open(row)
 }
 

src/views/business/department/form.vue

@@ -3,14 +3,14 @@
   <el-dialog title="部门信息" v-model="visible" width="400px" append-to-body draggable>
     <div class="form-container">
       <el-form ref="deptRef" class="master-container" :model="form" :rules="rules" label-width="100px">
-        <!-- <el-form-item label="上级部门" prop="parentId">
+        <el-form-item label="上级部门" prop="parentId">
           <el-tree-select v-model="form.parentId" :data="deptOptions" :props="{
               value: 'deptId',
               label: 'deptName',
               children: 'children'
             }" value-key="deptId" placeholder="请选择上级部门" check-strictly :render-after-expand="false" >
         </el-tree-select>
-        </el-form-item> -->
+        </el-form-item>
 
         <el-form-item label="部门名称" prop="deptName">
           <el-input v-model.trim="form.deptName" placeholder="请输入部门名称" />
@@ -48,7 +48,7 @@ const disabled = ref(false)
 const data = reactive({
   form: {},
   rules: {
-    // parentId: [ { required: true, message: '请选择上级部门', trigger: 'blur' }],
+    parentId: [ { required: true, message: '请选择上级部门', trigger: 'blur' }],
     deptName: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
     deptCode: [{ required: true, message: '部门编码不能为空', trigger: 'blur' }],
     orderNum: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }]
@@ -61,7 +61,10 @@ function open(row) {
   reset()
   visible.value = true
   listDept().then((response) => {
-    deptOptions.value = deptOptions.value.concat(proxy.handleTree(response.data, 'deptId'))
+   response.rows =  response.rows.filter((item) => {
+      return item.type == '0'
+    })
+    deptOptions.value = deptOptions.value.concat(proxy.handleTree(response.rows, 'deptId'))
     deptOptions.value.unshift({ deptId: '0', deptName: '无', children: [] })
   })
   if (row) {

src/views/business/department/index.vue

@@ -22,7 +22,7 @@
           <!-- 列表区 -->
           <el-table ref="departmentTable" v-loading="loading" :data="deptList" row-key="id" height="100%" :indent="20" default-expand-all highlight-current-row @current-change="handleGetUser">
             <el-table-column label="行号" type="index" width="50" align="center" />
-            <el-table-column label="部门名称" prop="label" header-align="center" />
+            <el-table-column label="部门名称" prop="label" align="center" />
             <el-table-column label="部门编码" prop="deptCode" align="center" />
             <!-- <el-table-column label="是否企业" prop="deptType" width="70" align="center">
               <template #default="scope">
@@ -34,7 +34,7 @@
                 <dict-tag :options="work_section_status" :value="scope.row.isWorkSection" />
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="150" align="center">
+            <el-table-column label="操作" width="150" align="center" v-hasPermi="['business:department:edit']">
               <template #default="scope">
                 <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:department:edit']">编辑</el-button>
                 <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['business:department:remove']">删除</el-button>
@@ -51,8 +51,8 @@
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="员工" />
         <el-form-item>
-          <el-button type="primary" icon="Plus" v-hasPermi="['business:department:add']" @click="openUser">新增</el-button>
-          <el-button type="danger" icon="Delete" v-hasPermi="['business:department:remove']" @click="handleUserDelete"> 删除</el-button>
+          <el-button type="primary" icon="Plus"  @click="openUser">新增</el-button>
+          <el-button type="danger" icon="Delete" :disabled="ids.length == 0"  @click="handleUserDelete"> 删除</el-button>
         </el-form-item>
       </el-form>
 
@@ -88,7 +88,7 @@
             </el-table-column>
             <el-table-column label="操作" width="50" prop="phoneNumber" align="center">
               <template #default="scope">
-                <el-button link type="primary" @click="handleUpdateUser(scope.row)" v-hasPermi="['business:department:edit']">修改</el-button>
+                <el-button link type="primary" @click="handleUpdateUser(scope.row)" >修改</el-button>
               </template>
             </el-table-column>
             <el-table-column />

src/views/business/process/index.vue

@@ -5,7 +5,7 @@
       <el-form-item class="section-title" label="标准工序" />
       <el-form-item>
         <el-button type="primary" icon="Plus" @click="handleShowProcessDialog(null)" v-hasPermi="['system:product:add']">新增</el-button>
-        <el-button type="success" icon="Refresh" @click="handleRefreshProcess">刷新</el-button>
+        <!-- <el-button type="success" icon="Refresh" @click="handleRefreshProcess">刷新</el-button> -->
       </el-form-item>
     </el-form>
 

src/views/business/product/form.vue

@@ -63,14 +63,14 @@
             <el-form-item label="成品长度" prop="lenght">
               <el-input-number
                 v-model="form.lenght"
-                :min="1"
+                :min="0"
                 controls-position="right"
               />
             </el-form-item>
             <el-form-item label="厚度" prop="thickness">
               <el-input-number
                 v-model="form.thickness"
-                :min="1"
+                :min="0"
                 controls-position="right"
               />
             </el-form-item>
@@ -131,7 +131,7 @@
             <el-form-item label="直径" prop="diameter">
               <el-input-number
                 v-model="form.diameter"
-                :min="1"
+                :min="0"
                 controls-position="right"
               />
             </el-form-item>

src/views/business/resourcePlan/index.vue

@@ -50,7 +50,7 @@
         <el-form-item >
           <el-button type="info" icon="Search" @click="handleQueryPlanDetails">搜索</el-button>
           <el-button type="primary" icon="Plus" :disabled="!currentResourceGroup.id" @click="handleOpenPlanDetailDialog()">新增</el-button>
-           <el-button type="danger" icon="Delete" :disabled="!currentResourceGroup.id" @click="handleDeletePlanDetail()">批量删除</el-button>
+          <el-button type="danger" icon="Delete" :disabled="!currentResourceGroup.id ||planDetailIds.length == 0" @click="handleDeletePlanDetail()">批量删除</el-button>
         </el-form-item>
         </el-form>
         <div class="el-table-container">
@@ -62,7 +62,15 @@
               <el-table-column label="生产计划单号" prop="productionPlanNo" width="100" align="center" />
               <el-table-column label="序号" width="60" prop="lineNumber" align="center" />
               <el-table-column label="产品描述" prop="productDescription" width="350" align="center" />
-              <el-table-column label="操作" width="150" align="center">
+              <el-table-column label="投产日期" prop="issuanceDate" width="100" align="center">
+              <template #default="scope">
+                <span>{{
+                  proxy.moment(scope.row.issuanceDate).format("YYYY-MM-DD")
+                }}</span>
+              </template>
+        </el-table-column>
+        <el-table-column label="批次数" prop="lotTotalNumber" width="70" align="center" ></el-table-column>
+              <el-table-column fixed="right" label="操作" width="80" align="center">
                 <template #default="scope">
                   <el-button  icon="delete" link type="danger" @click="handleDelPlanDetail(scope.row)">删除
                   </el-button>

src/views/business/tenant/form.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="租户信息" v-model="visible" width="600px" append-to-body draggable>
+  <el-dialog title="厂别信息" v-model="visible" width="600px" append-to-body draggable>
     <div class="form-container">
       <el-form ref="tenantRef" class="master-container" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="logo：" prop="logo">

src/views/business/workshop/index.vue

@@ -40,7 +40,7 @@
         <el-form-item class="section-title" label="工段" />
         <el-form-item>
           <el-button type="primary" icon="Plus" @click="handleAddDept">新增</el-button>
-          <el-button type="danger" icon="Delete" @click="handleDeptDelete">
+          <el-button type="danger" icon="Delete" :disabled="ids.length == 0" @click="handleDeptDelete">
             删除</el-button>
         </el-form-item>
       </el-form>