前端gjy

src/views/warehouse/warehouseManagementDelivery.vue

@@ -229,23 +229,22 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <el-upload action="https://www.zthymaoyi.com/upload/admin" @uploadSuccess="uploadSuccess"
-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar">
-        <el-button size="small" type="primary">点击上传</el-button>
-      </el-upload>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+      <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
@@ -391,7 +390,6 @@ export default {
       outContractNo: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
-      onChange: {},
       gradeList: [],
       agent: [],
        staffList: [],
@@ -440,6 +438,9 @@ export default {
     this.getList()
   },
   methods: {
+    uploadSuccessHandle1(res){
+      this.deptBudgetList.addressUrl=res.url
+    },
     //返回按钮
     revert() {
       this.$router.push({ path: 'warehouseManagementList' })

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -222,19 +222,22 @@
           </ws-form-item>
         </ws-info-table>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="dataList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+      <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--质检员-->
@@ -479,6 +482,9 @@ export default {
         this.deptBudgetList.pureWeight=(this.deptBudgetList.netWeight*(100-(this.deptBudgetList.tidalGrainWater-this.deptBudgetList.solidGrainWater)*this.deptBudgetList.buckleWeightRatio))/100
       }
     },
+    uploadSuccessHandle1(res){
+      this.dataList.addressUrl=res.url
+    },
     //返回按钮
     revert() {
       this.$router.go(-1)

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -196,8 +196,8 @@
             <el-date-picker
               v-model="dataList.inOutDate"
               placeholder="请选择入库日期"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
+              type="date"
+              value-format="yyyy-MM-dd"
             ></el-date-picker>
           </ws-form-item>
           <!-- 入库类型 -->
@@ -312,19 +312,22 @@
           </ws-info-table>
         </div>
       </div>
-      <div class="small-title">上传仓库照片</div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="dataList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
+       <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--质检员-->
@@ -580,6 +583,9 @@ export default {
       this.dataList.deductionWeight=this.$route.query.deductionWeight
   },
   methods: {
+    uploadSuccessHandle1(res){
+      this.dataList.addressUrl=res.url
+    },
     pureweight(status){
       console.log(this.deptBudgetList)
       if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){
@@ -1135,14 +1141,20 @@ export default {
           return
         }
         if (
-          (this.dataList.warehouseInOutDetail.bulkDensity &&
-            String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') != -1 &&
+          this.dataList.warehouseInOutDetail.bulkDensity < 1 ||
+          this.dataList.warehouseInOutDetail.bulkDensity > 40 ||
+          (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
+            '.'
+          ) != -1 &&
             String(this.dataList.warehouseInOutDetail.bulkDensity).length -
-              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf('.') + 1) >
-              2) || this.dataList.warehouseInOutDetail.bulkDensity > 1000 || this.dataList.warehouseInOutDetail.bulkDensity < 0
+              (String(this.dataList.warehouseInOutDetail.bulkDensity).indexOf(
+                '.'
+              ) +
+                1) >
+              0)
         ) {
           this.$message({
-            message: '容重输入错误',
+            message: '容重(克/升)输入错误! 取值范围1-40之间且是整数',
             type: 'warning',
           })
           return

src/views/warehouse/warehouseManagementPut.vue

@@ -334,6 +334,21 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
+      <el-upload
+            action="https://www.zthymaoyi.com/upload/admin"
+            :show-file-list="false"
+            :on-success="
+              (res) => {
+                uploadSuccessHandle1(res)
+              }
+            "
+            class="avatar-uploader"
+            accept=".jpg, .jpeg, .png, .gif"
+            ><el-button size="small" type="primary">点击上传</el-button>
+          </el-upload>
+          <div>
+            <img v-if='deptBudgetList.addressUrl' style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
+          </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
@@ -542,6 +557,9 @@ export default {
     }
   },
   methods: {
+    uploadSuccessHandle1(res){
+      this.deptBudgetList.addressUrl=res.url
+    },
      dataFilter1(val) {
        console.log(val)
         this.deptBudgetList.contractNo = val;