浏览代码

前端gjy

18513069273 4 年之前
父节点
当前提交
e4b927627b
共有 5 个文件被更改,包括 546 次插入75 次删除
  1. 二进制
      public/img/cangku.png
  2. 二进制
      public/img/radio-check.png
  3. 二进制
      public/img/radio.png
  4. 78 23
      src/views/warehouse/warehouseManagementIossRecord.vue
  5. 468 52
      src/views/warehouse/warehouseManagementRecord.vue

二进制
public/img/cangku.png


二进制
public/img/radio-check.png


二进制
public/img/radio.png


+ 78 - 23
src/views/warehouse/warehouseManagementIossRecord.vue

@@ -11,7 +11,13 @@
           type="primary"
           size="small"
           @click="returnWarehouse()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
@@ -21,7 +27,7 @@
         class="wenzi"
         :data="contractList.records"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="630"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -29,20 +35,50 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="货名"> </el-table-column>
-        <el-table-column prop="goodsName" label="当前累计入库(吨)">
+        <el-table-column prop="goodsName" label="货名"> </el-table-column>
+        <el-table-column prop="cumulativeStockIn" label="当前累计入库(吨)">
         </el-table-column>
-        <el-table-column prop="weight" label="当前累计出库(吨)">
+        <el-table-column prop="cumulativeStockOut" label="当前累计出库(吨)">
         </el-table-column>
-        <el-table-column prop="unitContractPrice" label="应余库存">
+        <el-table-column prop="surplusInventory" label="应余库存">
         </el-table-column>
-        <el-table-column prop="packingMethod" label="实际库存(吨)">
+        <el-table-column prop="physicalInventory" label="实际库存(吨)">
+          <template slot-scope="scope">
+            <span style="color: #5473e8">{{
+              scope.row.physicalInventory
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="loss" label="损耗量(吨)">
+          <template slot-scope="scope">
+            <span style="color: #ff9f24">{{ scope.row.loss }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="inventoryRatio" label="库损比例(‰)">
+          <template slot-scope="scope">
+            <span v-if="scope.row.inventoryRatio < 3" style="color: #8890b1">{{
+              scope.row.inventoryRatio
+            }}</span>
+            <span v-if="scope.row.inventoryRatio > 3" style="color: #fc5061">{{
+              scope.row.inventoryRatio
+            }}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="buyer" label="损耗量(吨)"> </el-table-column>
-        <el-table-column prop="seller" label="库损比例(‰)"> </el-table-column>
-        <el-table-column prop="seller" label="内勤"> </el-table-column>
-        <el-table-column prop="seller" label="录入时间"> </el-table-column>
+        <el-table-column prop="qualityInspector" label="内勤">
+        </el-table-column>
+        <el-table-column prop="createDate" label="录入时间"> </el-table-column>
       </el-table>
+      <div style="text-align: center; padding: 10px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="deptCircularPage.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="deptBudgetTotal"
+        >
+        </el-pagination>
+      </div>
     </div>
   </div>
 </template>
@@ -101,11 +137,9 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
       accessoryTFs: false,
     }
   },
@@ -288,14 +322,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.container .bg-left {
-  margin-left: 40px;
+.bg-left {
+  padding-left: 10px;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+.bg-right {
+  padding: 16px;
+  text-align: right;
 }
 .connert {
   width: 90%;
@@ -305,4 +337,27 @@ export default {
   width: 62px;
   text-align: right;
 }
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
 </style>

+ 468 - 52
src/views/warehouse/warehouseManagementRecord.vue

@@ -6,7 +6,7 @@
       </el-col>
       <el-col :span="6" class="bg-right">
         <el-button
-          class="bg-bottom"
+          class="bg-bottom adjustment"
           type="primary"
           size="small"
           @click="iossrecord()"
@@ -22,37 +22,89 @@
       </el-col>
     </el-row>
     <div class="center">
-      <h2>
-        {{ deptBudgetList.warehouseName }}库 {{ binNumber }}仓位(容量{{
-          capacity
-        }}吨)
+      <h2 style="padding-left: 20px">
+        <img
+          style="position: relative; top: 2px"
+          width="19"
+          height="19"
+          src="../../../public/img/cangku.png"
+          alt=""
+        />
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}库</span>
+        <span class="ware">{{ binNumber }}仓位(容量{{ capacity }}吨)</span>
       </h2>
-      <p>备注:{{ remark }}</p>
+      <p
+        style="
+          margin-left: 42px;
+          background: #f6f7fc;
+          color: #afb5cb;
+          width: 245px;
+        "
+      >
+        备注:{{ remark }}
+      </p>
+
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <ws-button
-          type="primary"
-          @click="record('')"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >全部记录</ws-button
+        <div
+          class="record"
+          :class="{ active: status == 1 }"
+          @click="record('', 1)"
         >
-        <ws-button
-          type="primary"
-          @click="record(1)"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >出库记录</ws-button
+          <img
+            v-if="status != 1"
+            width="14"
+            height="14"
+            src="../../../public/img/radio.png"
+            alt=""
+          />
+          <img
+            v-if="status == 1"
+            width="18"
+            height="18"
+            src="../../../public/img/radio-check.png"
+            alt=""
+          />全部记录
+        </div>
+        <div
+          class="record"
+          :class="{ active: status == 2 }"
+          @click="record(1, 2)"
         >
-        <ws-button
-          type="primary"
-          @click="record(2)"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >入库记录</ws-button
+          <img
+            v-if="status != 2"
+            width="14"
+            height="14"
+            src="../../../public/img/radio.png"
+            alt=""
+          />
+          <img
+            v-if="status == 2"
+            width="18"
+            height="18"
+            src="../../../public/img/radio-check.png"
+            alt=""
+          />出库记录
+        </div>
+        <div
+          class="record"
+          :class="{ active: status == 3 }"
+          @click="record(2, 3)"
         >
+          <img
+            v-if="status != 3"
+            width="14"
+            height="14"
+            src="../../../public/img/radio.png"
+            alt=""
+          />
+          <img
+            v-if="status == 3"
+            width="18"
+            height="18"
+            src="../../../public/img/radio-check.png"
+            alt=""
+          />入库记录
+        </div>
         <el-table :data="warehouseList.records" height="560">
           <el-table-column type="expand">
             <template #default="props">
@@ -103,7 +155,22 @@
             prop="netWeight"
             label="净重(吨)"
           ></el-table-column>
-          <el-table-column prop="grade" label="品级"> </el-table-column>
+          <el-table-column prop="grade" label="品级">
+            <template slot-scope="scope">
+              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '等外'" class="substandard">{{
+                scope.row.grade
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="inOutDate" label="出入库日期">
           </el-table-column>
           <el-table-column prop="inOutType" label="类型"> </el-table-column>
@@ -113,7 +180,22 @@
           <el-table-column prop="qualityInspector" label="经办人">
           </el-table-column>
           <el-table-column prop="buyer" label="内勤"> </el-table-column>
-          <el-table-column prop="addressUrl" label="附件"> </el-table-column>
+          <el-table-column prop="addressUrl" label="附件">
+            <template slot-scope="scope">
+              <img
+                width="18"
+                height="20"
+                style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png"
+                @click="fujian(scope.row)"
+                alt=""
+              />
+              <span v-if="scope.row.addressUrlArray.length > 0">{{
+                scope.row.addressUrlArray.length
+              }}</span>
+              <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+            </template>
+          </el-table-column>
           <el-table-column prop="createDate" label="录入时间">
           </el-table-column>
         </el-table>
@@ -130,6 +212,24 @@
         </div>
       </ws-form>
     </div>
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>查看附件</p>
+      <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"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -161,6 +261,7 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
+      appendixIdsAdd: '',
       // 是否显示
       showType: true,
       // 年
@@ -168,13 +269,15 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
+      radiostatus: 1,
+      capacity: '',
       searchKeyWord: '',
       contractType: 2,
       startDate: null,
       endDate: null,
       remark: '',
       binNumber: '',
+      status: 1,
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
@@ -192,7 +295,7 @@ export default {
       deptBudgetList: {},
       historyList: [],
       searchType: '',
-
+      allurl: '../../../public/img/radio.png',
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -263,10 +366,22 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    record(status) {
+    record(status, status1) {
+      this.status = status1
       this.searchType = status
       this.getList()
     },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
     getList() {
       addselectinfoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -279,6 +394,15 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray = response.records[
+                i
+              ].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+          }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -366,37 +490,329 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.winseaview-view {
-  height: 100vh;
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
 }
-/deep/.el-form .el-form-item {
-  width: 14.28%;
+.small-title {
+  position: relative;
+  padding: 10px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
 }
-.center {
+.position {
   position: relative;
-  top: 50px;
-  width: 90%;
-  height: 500px;
-  margin: 0 auto;
 }
-.center button {
-  margin-bottom: 15px;
+.add,
+.del {
+  position: absolute;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
 }
-.container .bg-left {
-  margin-left: 40px;
+.del {
+  right: -70px;
 }
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.ware {
+  font-size: 12px;
+  color: rgb(255, 255, 255);
+  background: rgb(175, 181, 203);
+  padding: 3px;
+  position: relative;
+  top: -1px;
+  border-radius: 3px;
+  text-align: center;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.adjustment.el-button--primary {
+  background-color: #51cdd9;
+  border-color: #51cdd9;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.record {
+  background: #fff;
+  color: #8890b1;
+  border-color: #fff;
+  display: inline-block;
+  margin-bottom: 10px;
+  cursor: pointer;
+  margin-left: 5px;
+  margin-right: 5px;
+}
+.record img {
+  position: relative;
+  top: 2px;
+}
+.record.active img {
+  position: relative;
+  top: 4px;
+}
+.record.active {
+  color: #262626;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.top-grade {
+  background: linear-gradient(90deg, #5678e9, #7993f6);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.second-class {
+  background: linear-gradient(90deg, #50cdd9, #82e2ea);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.third-class {
+  background: linear-gradient(90deg, #ffa735, #ffbf70);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.substandard {
+  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+  color: #fff;
+  padding: 3px;
+  border-radius: 2px;
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
 }
 .bg-right {
+  padding-right: 10px;
   text-align: right;
-  padding: 10px;
 }
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  padding: 0 1%;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.el-textarea__inner {
+  display: none;
+}
+.readonly {
+  width: 16%;
+}
+.ws-info-table .el-form-item {
+  width: 14.28%;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #f6f7fc;
+  font-size: 12px;
+  height: 45px;
+}
+//去边框
 /deep/.el-form-item {
-  width: 33%;
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
 }
 </style>