优化

src/views/business/businessHandling/index.vue

@@ -478,6 +478,9 @@ export default {
             message: '请上传委托书',
             trigger: 'change'
           }
+        ],
+        deviceType: [
+          { required: true, message: '请选择类型规格', trigger: 'blur' }
         ]
       },
       maTypeList: [], // 类型名称
@@ -542,6 +545,19 @@ export default {
       return this.maForm.bmFileInfos && this.maForm.bmFileInfos.length == 5
     }
   },
+  watch: {
+    equipmentList(newVal) {
+      if (newVal && newVal.length > 0) {
+        // 设备列表有值，设置deviceType为非必填
+        this.rules.deviceType = []
+      } else {
+        // 设备列表为空，设置deviceType为必填
+        this.rules.deviceType = [{ required: true, message: '请选择类型规格', trigger: 'blur' }]
+      }
+      // 重置表单验证状态，避免旧的错误提示残留
+      this.$refs.maForm.clearValidate('deviceType')
+    }
+  },
   created() {
     // getCode()
     if (this.$route.query.type == 'edit') {

src/views/business/businessHandlingRecord/index.vue

@@ -256,7 +256,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="print">打 印</el-button>
-        <el-button type="primary" @click="">查看PDF</el-button>
+        <!-- <el-button type="primary" @click="">查看PDF</el-button> -->
         <el-button @click="dialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>

src/views/material/archives/index.vue

@@ -187,12 +187,12 @@
                  :action="upload.url" style="width: 100%;" :file-list="fileList"
                  :on-success="handleSuccess" :on-error="handleError" :on-remove="handleFileRemove"
                  :before-upload="beforeUpload"
-                 accept=".rar,.zip"
+                 accept="image/*,.pdf,.doc,.docx"
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">  
-          <span>按住Ctrl可同时多选，支持上传rar/zip格式文件，单个文件不能超过5M</span> 
+          <span>按住Ctrl可同时多选，支持上传图、PDF、Word格式文件，单个文件不能超过5M</span> 
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">

src/views/material/report/backReport.vue

@@ -4,8 +4,8 @@
             <el-form-item  prop="dateRange">
                 <el-date-picker
                     v-model="dateRange"
-                    type="datetimerange"
+                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">

src/views/material/report/leaseOutReport.vue

@@ -4,8 +4,8 @@
             <el-form-item  prop="dateRange">
                 <el-date-picker
                     v-model="dateRange"
-                    type="datetimerange"
+                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">

src/views/material/report/repairReport.vue

@@ -4,8 +4,8 @@
             <el-form-item  prop="dateRange">
                 <el-date-picker
                     v-model="dateRange"
-                    type="datetimerange"
+                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">

src/views/material/report/scrapReport.vue

@@ -4,8 +4,8 @@
             <el-form-item  prop="dateRange">
                 <el-date-picker
                     v-model="dateRange"
-                    type="datetimerange"
+                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">

src/views/material/report/testedInBoundReport.vue

@@ -4,8 +4,8 @@
             <el-form-item  prop="dateRange">
                 <el-date-picker
                     v-model="dateRange"
-                    type="datetimerange"
+                    type="daterange"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     range-separator="至"
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">

vue.config.js

@@ -36,13 +36,13 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://36.33.26.201:19988/prod-api`,
-                // target: `http://192.168.0.15:18080`,//马
+                target: `http://192.168.0.96:18080`,//马
                 // target: `http://192.168.0.244:18580`,//测试
                 // target: `http://192.168.2.223:18080`,//山
                 // target: `http://192.168.2.23:18080`,//洪
                 // target: `http://192.168.0.234:18080`, //阮
                 // target: `http://192.168.137.1:18080`,//
-                target: `http://192.168.0.15:18080`, // 韩傲宇
+                // target: `http://192.168.0.15:18080`, // 韩傲宇
                 // target: `http://192.168.0.60:18080`, // 赵福海
                 changeOrigin: true,
                 pathRewrite: {