页面调整

src/views/pms/bom/MaterialList.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1300px; max-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1300px; min-height: 300px">
     <ContentWrap>
       <el-form
         class="-mb-15px"

src/views/pms/failure/IotFailureReportForm.vue

@@ -157,16 +157,12 @@ const openForm = () => {
   deviceFormRef.value.open()
 }
 const formRules = reactive({
-  // failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
-  // failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
   deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
   ifDeal: [{ required: true, message: '是否解决不能为空', trigger: 'blur' }],
   needHelp: [{ required: true, message: '是否协助不能为空', trigger: 'blur' }],
   failureTime:[{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
   failureSystem:[{ required: true, message: '故障系统不能为空', trigger: 'blur' }],
-  solution:[{ required: true, message: '解决办法不能为空', trigger: 'blur' }],
-  // deviceId: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
-  //status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  solution:[{required: () => formData.value.ifDeal==true, message: '解决办法不能为空', trigger: 'blur'}],
 })
 const formRef = ref() // 表单 Ref
 

src/views/pms/inspect/route/InspectItemList.vue

@@ -70,6 +70,11 @@
         />
         <el-table-column label="巡检项" align="center" prop="item" />
         <el-table-column label="巡检标准" align="center" prop="standard" />
+        <el-table-column label="附件" align="center" prop="urls" >
+          <template #default="scope">
+            <el-button v-if="scope.row.urls" link type="primary" @click="openWeb(scope.row.urls)"> <Icon size="19" icon="ep:view" /></el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="排序" align="center" prop="sort" />
         <el-table-column
           label="创建时间"
@@ -110,6 +115,9 @@ const queryParams = reactive({
   deviceId: undefined,
   createTime: undefined,
 })
+const openWeb = (url) => {
+  window.open('http://1.94.244.160:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(url)));
+}
 const toggleAll = () => {
   list.value.forEach((row) => {
     tableRef.value.toggleRowSelection(row, true)

src/views/pms/iotmainworkorder/WorkOrderMaterial.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1100px; min-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择物料" style="width: 1100px; min-height: 400px">
     <ContentWrap>
       <el-form
         class="-mb-15px"
@@ -69,7 +69,7 @@
           :show-overflow-tooltip="true"
         />
         <el-table-column label="单位" align="center" prop="unit" />
-        <el-table-column label="单价" align="center" prop="unitPrice" />
+        <el-table-column label="单价(元)" align="center" prop="unitPrice" />
         <el-table-column label="总库存数量" align="center" prop="totalInventoryQuantity" />
         <el-table-column label="来源" align="center" prop="materialSource" />
         <el-table-column label="消耗数量" align="center" prop="quantity">
@@ -139,6 +139,8 @@ const handleChildSubmit = (formData) => {
   modified.materialName = modified.name;
   modified.materialCode = modified.code;
   modified.materialSource = '手动添加';
+  modified.quantity = modified.depleteCount;
+  modified.unitPrice = modified.price;
   addMateriall.value = modified;
   list.value.unshift(modified)
   total.value = total.value+1

src/views/pms/maintain/IotMaintain.vue

@@ -111,34 +111,34 @@
                 <UploadImg v-model="formData.pic" height="55px" />
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="formData.type === 'out'">
-              <el-form-item label="供应商" prop="supplier" :rules="supplierRules">
-                <el-select
-                  v-model="formData.supplier"
-                  placeholder="请输入供应商"
-                  :model-value="supplierLabel"
-                  @click="openCustomer('supplier')"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="formData.type === 'out'">
-              <el-form-item label="维修费用" prop="maintainFee" :rules="strictRules">
+<!--            <el-col :span="8" v-if="formData.type === 'out'">-->
+<!--              <el-form-item label="供应商" prop="supplier" :rules="supplierRules">-->
+<!--                <el-select-->
+<!--                  v-model="formData.supplier"-->
+<!--                  placeholder="请输入供应商"-->
+<!--                  :model-value="supplierLabel"-->
+<!--                  @click="openCustomer('supplier')"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="8" v-if="formData.type === 'in'">
+              <el-form-item label="维修费用(元)" prop="maintainFee">
                 <el-input-number
+                  disabled
                   v-model="formData.maintainFee"
                   :min="0"
                   :precision="2"
                   :step="0.1"
-                  placeholder="请输入维修费用"
                   style="width: 100%"
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-if="formData.type === 'out'">
-              <el-form-item label="委外相关附件" prop="outFile">
-                <UploadFile v-model="formData.outFile" class="min-w-80px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
+<!--            <el-col :span="8" v-if="formData.type === 'out'">-->
+<!--              <el-form-item label="委外相关附件" prop="outFile">-->
+<!--                <UploadFile v-model="formData.outFile" class="min-w-80px" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+            <el-col :span="12">
               <el-form-item label="故障描述" prop="description">
                 <el-input type="textarea" v-model="formData.description" />
               </el-form-item>
@@ -153,7 +153,7 @@
                 <el-input type="textarea" v-model="formData.solution" />
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="备注" prop="remark">
                 <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
               </el-form-item>
@@ -192,13 +192,13 @@
             <template #default="scope">
               <div style="display: flex; justify-content: center; align-items: center; width: 100%">
                 <div>
-                  <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                   <el-button
                     style="vertical-align: middle"
                     link
                     type="danger"
                     @click="handleDelete(scope.row.code)"
                   >
+                    <Icon style="vertical-align: middle; color: #ea3434" icon="ep:zoom-out" />
                     移除
                   </el-button>
                 </div>
@@ -302,6 +302,7 @@ const list = ref<IotMaintainMaterialVO[]>([]) // 列表的数据
 const { params, name } = useRoute() // 查询参数
 const id = params.id
 const supplierLabel = ref('') // 表单的类型：create - 新增；update - 修改
+const totalFee = ref(0)
 const addFormData = ref({
   name: '',
   deviceName: '',
@@ -335,14 +336,7 @@ const formData = ref({
   maintainFee: undefined,
   outFile: undefined
 })
-const strictRules = {
-  required: true,
-  message: '请输入维修费用'
-}
-const supplierRules = {
-  required: true,
-  message: '请选择供应商'
-}
+
 const formRules = reactive({
   deviceName: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
   failureCode: [{ required: true, message: '故障编码不能为空', trigger: 'blur' }],
@@ -372,7 +366,7 @@ const outFormRules = reactive({
   maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
   maintainPerson: [{ required: true, message: '维修负责人不能为空', trigger: 'blur' }],
   deviceId: [{ required: true, message: '设备id不能为空', trigger: 'blur' }],
-  maintainFee: [{ required: true, message: '维修费用不能为空', trigger: 'blur' }],
+  // maintainFee: [{ required: true, message: '维修费用不能为空', trigger: 'blur' }],
   supplier: [{ required: true, message: '供应商不能为空', trigger: 'blur' }]
 })
 
@@ -468,11 +462,16 @@ const selectChoose = (selectedMaterial) => {
       materialList.value.push(newMaterial)
     }
   })
+
   list.value.forEach((item) => {
     if (item.bomNodeId === bomNodeId.value) {
       item.materials = processedMaterials
     }
+    item.materials.forEach((it) => {
+      totalFee.value = it.unitPrice * it.quantity+totalFee.value
+    })
   })
+  formData.value.maintainFee = totalFee.value;
   console.log('选择完成的数据：', JSON.stringify(selectedMaterial))
   console.log('添加到本地列表的数据：', materialList.value)
 }

src/views/pms/maintain/index.vue

@@ -156,6 +156,7 @@
               <dict-tag :type="DICT_TYPE.PMS_MAIN_STATUS" :value="scope.row.status" />
             </template>
           </el-table-column>
+          <el-table-column label="工单来源" align="center" prop="maintainType" />
           <el-table-column label="审核状态" align="center" prop="auditStatus" >
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />

src/views/pms/maintain/material/ChooseMaintain.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择维修项" style="width: 1100px; max-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择维修项" style="width: 1100px; min-height: 300px">
     <ContentWrap>
       <el-form
         class="-mb-15px"
@@ -27,7 +27,7 @@
         <el-form-item>
           <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
           <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-          <el-button @click="handleConfirm" class="custom-green-button"
+          <el-button @click="handleConfirm" type="danger"
             ><Icon icon="ep:check" class="mr-5px" /> 确认选择</el-button
           >
           <el-button @click="toggleAll" type="primary"

src/views/pms/maintain/material/MaintainMaterialDrawer.vue

@@ -44,7 +44,7 @@
           controls-position="right"
         />
       </el-form-item>
-      <el-form-item label="单价" prop="price1" style="margin-bottom: 30px">
+      <el-form-item label="单价(元)" prop="price1" style="margin-bottom: 30px">
         <el-input-number
           v-model="drawerFormData.price1"
           :min="0"
@@ -125,7 +125,8 @@ const resetDrawerForm = () => {
 const formRules = reactive({
   code1: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
   name1: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
-  depleteCount1: [{ required: true, message: '消耗数量不能为空', trigger: 'blur' }]
+  depleteCount1: [{ required: true, message: '消耗数量不能为空', trigger: 'blur' }],
+  price1:[{ required: true, message: '单价不能为空', trigger: 'blur' }],
 })
 const materialFormRef = ref()
 const openForm = () => {