Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -105,10 +105,10 @@
   }
 
   .el-card__body {
-    padding: 15px 0px;
+    padding: 10px 0px;
 
     .el-row {
-      margin: 10px;
+      margin: 5px 0;
     }
   }
 }
@@ -204,43 +204,43 @@
 
 //已变更
 .ialteration {
-  border: 1px solid #F39800;
-  background-color: #F7F3ED;
-  color: #F39800;
+  border: 1px solid #f39800;
+  background-color: #f7f3ed;
+  color: #f39800;
 }
 //已提交
 .isubmit {
   border: 1px solid #356899;
-  background-color: #ECF0F4;
+  background-color: #ecf0f4;
   color: #356899;
 }
 //已作废
 .icancellation {
-  border: 1px solid #95969D;
-  background-color: #EBEBEB;
-  color: #95969D;
+  border: 1px solid #95969d;
+  background-color: #ebebeb;
+  color: #95969d;
 }
 //已终止
 .ibreakup {
-  border: 1px solid #0D0D26;
-  background-color: #E8E8E8;
-  color: #0D0D26;
+  border: 1px solid #0d0d26;
+  background-color: #e8e8e8;
+  color: #0d0d26;
 }
 
 //全部发货
 .allshipments {
-  color: #3AC33D;
+  color: #3ac33d;
   background-color: transparent;
   border: none;
 }
 //未发货
 .noshipments {
-  color: #4589FF;
+  color: #4589ff;
   background-color: transparent;
   border: none;
 }
 .partshipments {
-  color: #19A998;
+  color: #19a998;
   background-color: transparent;
   border: none;
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue

@@ -50,7 +50,9 @@
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">基础信息</span>
         </template>
         <el-row>
-          <el-col :span="6">
+          <el-col :span="12">
+            <el-row>
+              <el-col :span="12">
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="项目编号" prop="code">
@@ -90,20 +92,13 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                <el-form-item label="所属业务线" prop="businessLine">
-                  <el-select
+                    <el-form-item label="模具名称" prop="mouldName">
+                      <el-input
                         class="!w-250px"
-                    v-model="formData.businessLine"
-                    placeholder="请选择所属业务线"
                         :disabled="alterDisabled || detailDisabled"
-                  >
-                    <el-option
-                      v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                        v-model="formData.mouldName"
+                        placeholder="请输入模具名称"
                       />
-                  </el-select>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -111,6 +106,7 @@
                   <el-col :span="24">
                     <el-form-item label="项目开始日期" prop="projectStartTime">
                       <el-date-picker
+                        class="!w-250px"
                         v-model="formData.projectStartTime"
                         type="date"
                         value-format="x"
@@ -120,21 +116,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="可引用的原有技术" prop="referenceTechnology">
-                  <el-input
-                    class="!w-250px"
-                    :disabled="detailDisabled"
-                    v-model="formData.referenceTechnology"
-                    placeholder="请输入可引用的原有技术"
-                    :class="{ 'alter-class': fieldHasAlter('referenceTechnology') }"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
               </el-col>
-          <el-col :span="6">
+              <el-col :span="12">
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="单据日期" prop="orderTime">
@@ -174,13 +157,20 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                <el-form-item label="模具图号" prop="blueprintNo">
-                  <el-input
+                    <el-form-item label="所属业务线" prop="businessLine">
+                      <el-select
                         class="!w-250px"
+                        v-model="formData.businessLine"
+                        placeholder="请选择所属业务线"
                         :disabled="alterDisabled || detailDisabled"
-                    v-model="formData.blueprintNo"
-                    placeholder="请输入模具图号"
+                      >
+                        <el-option
+                          v-for="dict in getStrDictOptions(DICT_TYPE.HELI_BUSINESS_LINE)"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
                         />
+                      </el-select>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -212,6 +202,22 @@
                   </el-col>
                 </el-row>
               </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="可引用的原有技术" prop="referenceTechnology">
+                  <el-input
+                    class="!w-703px"
+                    :disabled="detailDisabled"
+                    v-model="formData.referenceTechnology"
+                    placeholder="请输入可引用的原有技术"
+                    :class="{ 'alter-class': fieldHasAlter('referenceTechnology') }"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+
           <el-col :span="6">
             <el-row>
               <el-col :span="24">
@@ -246,6 +252,26 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="性质" prop="property">
+                  <el-select
+                    class="!w-250px"
+                    :class="{ 'alter-class': fieldHasAlter('property') }"
+                    :disabled="detailDisabled"
+                    v-model="formData.property"
+                    placeholder="请选择性质"
+                  >
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item label="是否有价格" prop="hasPrice">
@@ -284,21 +310,6 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="是否已变更" prop="hasAlter">
-                  <el-radio-group v-model="formData.hasAlter" disabled>
-                    <el-radio
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-                      :key="dict.value"
-                      :label="dict.value"
-                    >
-                      {{ dict.label }}
-                    </el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-col>
           <el-col :span="6">
             <el-row>
@@ -322,12 +333,12 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="模具名称" prop="mouldName">
+                <el-form-item label="模具图号" prop="blueprintNo">
                   <el-input
                     class="!w-250px"
                     :disabled="alterDisabled || detailDisabled"
-                    v-model="formData.mouldName"
-                    placeholder="请输入模具名称"
+                    v-model="formData.blueprintNo"
+                    placeholder="请输入模具图号"
                   />
                 </el-form-item>
               </el-col>
@@ -366,31 +377,26 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="性质" prop="property">
-                  <el-select
-                    class="!w-250px"
-                    :class="{ 'alter-class': fieldHasAlter('property') }"
-                    :disabled="detailDisabled"
-                    v-model="formData.property"
-                    placeholder="请选择性质"
-                  >
-                    <el-option
-                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PROPERTY)"
+                <el-form-item label="是否已变更" prop="hasAlter">
+                  <el-radio-group v-model="formData.hasAlter" disabled>
+                    <el-radio
+                      v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
                       :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                      :label="dict.value"
+                    >
+                      {{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-col>
         </el-row>
-        <el-row style="margin-top:-10px;margin-left:15px">
+        <el-row >
           <el-col :span="12">
             <el-form-item label="检验要求" prop="qualityRequirement">
               <el-input
-                class="!w-700px"
+                class="!w-703px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.qualityRequirement"
@@ -404,7 +410,7 @@
           <el-col :span="12">
             <el-form-item label="备注" prop="remark" :disabled="detailDisabled">
               <el-input
-                class="!w-700px"
+                class="!w-703px"
                 :disabled="detailDisabled"
                 type="textarea"
                 v-model="formData.remark"

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -1,9 +1,14 @@
 <template>
   <!-- 入库 -->
-  <el-card class="hl-card">
+  <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
+    <div class="abstatus">
+      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
+      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <span v-else></span>
+    </div>
     <el-form
       ref="formRef"
       :model="formData"
@@ -517,7 +522,6 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
   if (formData.value.matItemDOList.length === 0) {
@@ -579,7 +583,6 @@ const handleStatus = async (num) => {
   query.type = 'update'
   query.id = formData.value.id
   reload()
-
 }
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -671,7 +674,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
   } finally {
     formLoading.value = false
   }
@@ -697,7 +699,7 @@ const submitForm = async () => {
   query.id = storageid.value
   formData.value.id = storageid.value
   //页面重新加载
-  reload();
+  reload()
 }
 
 var matCount = 1
@@ -866,7 +868,6 @@ onMounted(async () => {
       isShowBtnDelete.value = false
     }
 
-
     //获得库区列表
     const queryParamsRg = reactive({
       pageNo: 1,

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue

@@ -1,9 +1,14 @@
 <template>
   <!-- 出库 -->
-  <el-card class="hl-card">
+  <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
     </template>
+    <div class="abstatus">
+      <img src="/src/assets/imgs/status/status2.png" v-if="formData.status == 2" alt="" />
+      <img src="/src/assets/imgs/status/statuszf.png" v-else-if="formData.status == 3" alt="" />
+      <span v-else></span>
+    </div>
     <el-form
       ref="formRef"
       :model="formData"
@@ -177,7 +182,12 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
+                  <el-table-column
+                    prop="matSpec"
+                    label="规格/型号"
+                    min-width="120"
+                    align="center"
+                  />
 
                   <el-table-column prop="matUnit" label="系统单位" min-width="120" align="center">
                     <template #default="scope">
@@ -489,7 +499,6 @@ const subFormRules = reactive({
   storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }]
 })
 const handleStatus = async (num) => {
-
   // 校验表单
   await formRef.value.validate()
   if (formData.value.matItemDOList.length === 0) {
@@ -660,9 +669,6 @@ const saveFormData = async () =>{
     }
     formData.value = await StorageApi.getStorage(storageid.value)
     message.success(t(commonResult))
-
-    
-   
   } finally {
     formLoading.value = false
   }
@@ -712,7 +718,6 @@ const onAddItem = () => {
     }
     matCount = matCount + 1
 
-
     formData.value.matItemDOList.push(newData)
   } else {
     message.alertWarning('请选择出库仓库')
@@ -748,11 +753,14 @@ const handleWh = async (wid) => {
   let matParams = {
     pageNo: 1,
     pageSize: 99,
-    status: "1"
+    status: '1'
   }
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == wid) !== undefined
+  )
 
   formData.value.matItemDOList = []
   // formData.value.matItemDOList.forEach(item => {
@@ -792,7 +800,12 @@ const remoteMatCodeSearch = async (name) => {
 
   const dataMat = await MaterialApi.getMaterialPage(matParams)
   matList.value = []
-  matList.value = dataMat.list.filter((item) => matLastRemoteData.find((fish) => fish.matId === item.id && fish.whId == formData.value.whId) !== undefined)
+  matList.value = dataMat.list.filter(
+    (item) =>
+      matLastRemoteData.find(
+        (fish) => fish.matId === item.id && fish.whId == formData.value.whId
+      ) !== undefined
+  )
   matSelectLoading.value = false
 }
 
@@ -862,8 +875,6 @@ onMounted(async () => {
   dialogTitle.value = t('action.' + query.type)
   dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
- 
-
   //-------------------仓库全数据
   const data = await WarehouseApi.getWarehouseSimpList()
   warehouseList.value = data