现场版本

public/index.html

@@ -9,7 +9,7 @@
     <script>
       window._CONFIG = {};
       // window._CONFIG['dlURL'] = 'http://192.168.2.105:5007';
-      // window._CONFIG['dlURL'] = 'http://192.168.3.74:5001';
+       //window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
       window._CONFIG['dlURL'] = 'http://41.204.124.248:5001';
       
     </script>

src/main.js

@@ -33,9 +33,9 @@ Vue.config.productionTip = false
 
 // axios.defaults.baseURL = 'http://192.168.3.74:5001'
 //开发环境 
-axios.defaults.baseURL = 'http://192.168.3.188:5007'
+//axios.defaults.baseURL = 'http://192.168.3.188:5007'
 //现场
-// axios.defaults.baseURL = 'http://41.204.124.248:5001'
+ axios.defaults.baseURL = 'http://41.204.124.248:5001'
 
 
 // 配置请求超时

src/store/index.js

@@ -29,7 +29,7 @@ export default new Vuex.Store({
       {
         id: 1,
         path: '/borrow',
-        menuName: '借用/领用管理',
+        menuName: '借领管理',
         icon: "iconfont icon-Home",
         children: [
           {
@@ -165,7 +165,7 @@ export default new Vuex.Store({
             {
               id: 6 - 3,
               path: "/systemConfig/police",
-              menuName: "人员设置",
+              menuName: "人员管理",
               // icon: 'icon-Export',
             }
           ],

src/views/baseInfo/Materiel.vue

@@ -69,7 +69,7 @@
           v-model="searchData.IsHaoCai"
           filterable
           clearable
-          placeholder="请选择是否为耗材"
+          placeholder="请选择是否贴标"
         >
           <el-option
             v-for="item in optionsEquipment"
@@ -213,9 +213,9 @@
                     <td class="textContent">
                       {{ detailData.Unit }}
                     </td>
-                    <th class="textHeader">所否为消耗品</th>
+                    <th class="textHeader">是否贴标</th>
                     <td class="textContentLast">
-                      {{ detailData.IsHaoCai == 1 ? "是" : "否" }}
+                      {{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
                     </td>
                   </tr>
                   <tr style="border-bottom: 1px solid #e8e8e8">
@@ -259,11 +259,17 @@
                     <th class="textHeader">视频查看</th>
                     <td class="textContentLast">
                      <video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null"
-                           v-bind:src="detailData.VideoUrl"
+                           v-bind:src="'http://41.204.124.248:5001/' +detailData.videoUrl"
                            class="avatar video-avatar"
                            controls="controls">
                         您的浏览器不支持视频播放
                     </video>
+                    <!-- <video v-if="detailData.VideoUrl !=''&& detailData.VideoUrl !=null"
+                           v-bind:src="'http://192.168.3.188:5007/' + detailData.VideoUrl"
+                           class="avatar video-avatar"
+                           controls="controls">
+                        您的浏览器不支持视频播放
+                    </video> -->
                     </td>
                   </tr>
                 </tbody>
@@ -412,7 +418,7 @@
                 </el-input>
               </el-form-item>
                <el-form-item label="视频上传" class="diaC" >
-                  <!-- action="http://192.168.2.105:5007/api/UpFile/UploadVideo" -->
+                  <!-- action="http://192.168.3.188:5007/api/UpFile/UploadVideo" -->
 <el-upload
   class="avatar-uploader"
 
@@ -423,8 +429,14 @@
                            v-bind:on-success="handleVideoSuccess"
                            v-bind:before-upload="beforeUploadVideo"
                            v-bind:show-file-list="false">
+                    <!-- <video v-if="videoForm.storageurl !='' && !videoFlag"
+                           v-bind:src="'http://192.168.3.188:5007/'+videoForm.storageurl"
+                           class="avatar video-avatar"
+                           controls="controls">
+                        您的浏览器不支持视频播放
+                    </video> -->
                     <video v-if="videoForm.storageurl !='' && !videoFlag"
-                           v-bind:src="videoForm.storageurl"
+                           v-bind:src="'http://41.204.124.248:5001/'+videoForm.storageurl"
                            class="avatar video-avatar"
                            controls="controls">
                         您的浏览器不支持视频播放
@@ -530,15 +542,15 @@ export default {
         },
         {
           value: "1",
-          label: "耗材",
+          label: "未贴标",
         },
         {
           value: "0",
-          label: "非耗材",
+          label: "已贴标",
         },
       ],
        videoForm: {
-storageurl: ""// 视频地址
+       storageurl: "",// 视频地址
        },
       searchData: {
         Page: 1,
@@ -584,7 +596,8 @@ storageurl: ""// 视频地址
       borrowTableVisible: false,
       detailData: {
         MaterielCode: "",
-        VideoUrl:""
+        VideoUrl:"",
+        //videoUrlSrc:""
       },
       fixdetailData: [],
       loading: false,
@@ -672,11 +685,21 @@ storageurl: ""// 视频地址
     beforeUploadVideo(file) {
       var fileSize = file.size / 1024 / 1024 < 50;
                 if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.type) == -1) {
-                    layer.msg("请上传正确的视频格式");
+                    //layer.msg("请上传正确的视频格式");
+                    this.$message({
+                     message: "请上传正确的视频格式",
+                     type: "warning",
+
+                    })
                     return false;
                 }
                 if (!fileSize) {
-                    layer.msg("视频大小不能超过50MB");
+                    //layer.msg("视频大小不能超过50MB");
+                    this.$message({
+                     message: "视频大小不能超过50MB",
+                     type: "warning",
+
+                    })
                     return false;
                 }
                 this.isShowUploadVideo = false;
@@ -697,10 +720,10 @@ console.log("up")
       if (res.Success === true) {
         this.$message.success('视频上传成功')
         // this.videoForm.storageurl = 'http://192.168.3.74:5001/'+res.Info
-        //  this.videoForm.storageurl = 'http://192.168.2.105:5007/'+res.Info
-         this.videoForm.storageurl = 'http://41.204.124.248:5001/'+res.Info
+          this.videoForm.storageurl = res.Info
+         //this.videoForm.storageurl = 'http://41.204.124.248:5001/'+res.Info
 
-        console.log("imgUrl",this.videoForm.storageurl)
+        console.log("vUrl",this.videoForm.storageurl)
       } else {
         this.$message.error('视频上传失败，请重新上传！')
       }
@@ -709,6 +732,8 @@ console.log("up")
     check(row) {
       this.borrowTableVisible = true;
       this.detailData = row;
+      //this.detailData.videoUrlSrc=window._CONFIG['dlURL']+'/'+videoUrl;
+      //console.log(this.detailData.videoUrl)
       console.log("de",this.detailData)
     },
     //编辑信息
@@ -720,7 +745,7 @@ console.log("up")
       this.EditRuleForm = JSON.parse(JSON.stringify(row));
       if  (row.VideoUrl!=null)
       {
-this.videoForm.storageurl=JSON.parse(JSON.stringify(row.VideoUrl));
+      this.videoForm.storageurl=JSON.parse(JSON.stringify(row.VideoUrl));
       }
       
       this.title = "修改物料";

src/views/baseInfo/equipmentManage.vue

@@ -112,7 +112,7 @@
           style="height: 40px"
           class="funcButton"
           @click="addEquipment()"
-          >添加装备</el-button
+          >添加装备（未贴标）</el-button
         >
       </el-form>
 
@@ -323,7 +323,7 @@
                     <th class="textHeader">视频查看</th>
                     <td class="textContentLast">
                      <video height="250px" width="300px" v-if="videoUrl !=''&& videoUrl !=null"
-                           v-bind:src="videoUrl"
+                           v-bind:src="videoUrlSrc"
                            class="avatar video-avatar"
                            controls="controls">
                         您的浏览器不支持视频播放
@@ -497,7 +497,7 @@
                 <el-form-item class="diaB" label="采购日期">
                   <el-date-picker
                     v-model="ruleForm.BuyTime"
-                    value-format="yyyy年MM月dd日"
+                    value-format="yyyy-MM-dd"
                     class="inputA"
                     type="date"
                     placeholder="选择日期"
@@ -533,9 +533,9 @@
                 </el-form-item>
                 <el-form-item class="diaB" label="报废日期">
                   <el-date-picker
-                    class="inputA"
-                    value-format="yyyy年MM月dd日"
                     v-model="ruleForm.TermTime"
+                    class="inputA"
+                    value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期"
                   >
@@ -708,6 +708,7 @@ export default {
         IsPublic: [{ required: true, message: "请选择类型", trigger: "blur" }],
       },
       videoUrl:"",
+      videoUrlSrc:"",
       IsPublicType: [
         {
           value: 0,
@@ -747,8 +748,8 @@ export default {
       ],
       aaa: "",
       classDis: false,
-      peopleShow: true,
-      warehouseSelect: false,
+      peopleShow: false,
+      warehouseSelect: true,
       usersOption: [],
       sizeOption: [],
       MaterielOption: [],
@@ -781,7 +782,7 @@ export default {
         },
       ],
 
-      selectShow: false,
+      selectShow: true,
       searchData: {
         Page: 1,
         Rows: 10,
@@ -829,11 +830,11 @@ export default {
       ruleForm: {
         ID: 0,
         EqType: 0,
-        IsPubilc: 2,
+        //IsPubilc: 1,
         EqName: "",
         EqCode: "",
-        BuyTime: "",
-        TermTime: "",
+        BuyTime: null,
+        TermTime: null,
         Price: 1,
         BaoYangDays: 1,
         Remarks: "",
@@ -841,7 +842,7 @@ export default {
         EqHaoCai: 1,
         EqCount: 1,
         policeUserID: "",
-        IsPublic: 2,
+        IsPublic: 1,
         CategoryID: "",
         CategoryName: "",
         EqSizeId: "",
@@ -876,20 +877,20 @@ export default {
       resetForm() {
         console.log("aaa")
         this.$refs["ruleForm"].resetFields();
-        this.peopleShow = true;
-        this.warehouseSelect = false;
-        this.selectShow = false;
+        this.peopleShow = false;
+        this.warehouseSelect = true;
+        this.selectShow = true;
         this.MaterielOption = [];
         this.storageOption = [];
         this.warehouseOption = [];
         this.ruleForm = {
           ID: 0,
           EqType: 2,
-          IsPubilc: 2,
+          //IsPubilc: 1,
           EqName: "",
           EqCode: "",
-          BuyTime: "",
-          TermTime: "",
+          BuyTime: null,
+          TermTime: null,
           Price: 1,
           BaoYangDays: 1,
           Remarks: "",
@@ -900,7 +901,7 @@ export default {
           IsNormal: "",
           EqCount: 1,
           policeUserID: "",
-          IsPublic: 2,
+          IsPublic: 1,
           CategoryID: "",
           CategoryName: "",
           EqSizeId: "",
@@ -995,7 +996,7 @@ export default {
           const formData = new FormData();
           formData.append("ID", this.ruleForm.ID);
           formData.append("EqType", this.ruleForm.EqType);
-          formData.append("IsPubilc", this.ruleForm.IsPublic.toString());
+          formData.append("IsPublic", this.ruleForm.IsPublic.toString());
           formData.append("EqCode", this.ruleForm.EqCode);
 
           formData.append("EqName", this.ruleForm.EqName);
@@ -1024,7 +1025,7 @@ export default {
             },
           };
 
-          if (type === "添加装备(耗材)") {
+          if (type === "添加装备(未贴标)") {
             const { data: res } = await this.$axios.post(
               "/api/Equipment",
               formData,
@@ -1057,6 +1058,7 @@ export default {
       this.detailData = res;
       console.log("ro",row)
       this.videoUrl=row.VideoUrl;
+      this.videoUrlSrc=window._CONFIG['dlURL']+'/'+this.videoUrl;
     },
     //删除预案
     deleteClick(row) {
@@ -1083,7 +1085,7 @@ export default {
     //添加装备
     async addEquipment() {
       this.classDis = false;
-      this.title = "添加装备(耗材)";
+      this.title = "添加装备(未贴标)";
       this.addVisible = true;
       const { data: resclass } = await this.$axios.get("api/EqCategory", {
         params: this.searchEqCategoryData,

src/views/baseInfo/size.vue

@@ -278,11 +278,11 @@ export default {
         },
         {
           value: "1",
-          label: "耗材",
+          label: "未贴标",
         },
         {
           value: "0",
-          label: "非耗材",
+          label: "已贴标",
         },
       ],
       searchEqCategoryData: {

src/views/borrow/borrowGet.vue

@@ -88,7 +88,7 @@
           style="height: 40px; margin-left: 10px"
           class="funcButton"
           @click="addRecive(0)"
-          >借用下发(耗材)</el-button
+          >借用下发(未贴标)</el-button
         >
         <el-button
           type="primary"
@@ -96,7 +96,7 @@
           style="height: 40px"
           class="funcButton"
           @click="addRecive(1)"
-          >借用下发(非耗材)</el-button
+          >借用下发(已贴标)</el-button
         >
       </el-form>
 
@@ -287,10 +287,20 @@
                   align="center"
                 >
                 </el-table-column>
+                 <el-table-column
+                  prop="NameAndCode"
+                  label="装备名称"
+                  align="center"
+                >
+                </el-table-column>
                 <el-table-column prop="EqSizeName" label="号型" align="center">
                 </el-table-column>
                 <el-table-column prop="LyCount" label="借用数量" align="center">
                 </el-table-column>
+                <el-table-column prop="OutTime" label="借出时间" align="center">
+                </el-table-column>
+                <el-table-column prop="ReturnTime" label="归还时间" align="center">
+                </el-table-column>
               </el-table>
             </template>
           </el-card>
@@ -938,6 +948,8 @@ export default {
         Order: "ESC",
         MaterielId: "",
         EqSizeId: "",
+        State: 0,
+        IsNoBorrow: true
       },
       searchMaterielData: {
         Page: 1,
@@ -1114,7 +1126,7 @@ export default {
         this.AddPlanForm.EquipmentName=obj.NameAndCode;
         this.AddPlanForm.EquipmentId = obj.ID;
         this.AddPlanForm.NameAndCode = obj.NameAndCode;
-        this.AddPlanForm.LabelEpc = obj.LabelEpc;
+        this.AddPlanForm.epc = obj.LabelEpc;
         console.log("val",this.AddPlanForm)
       }
       else
@@ -1266,7 +1278,7 @@ export default {
         EqSizeCode: this.AddPlanForm.EqSizeCode,
         NameAndCode: this.AddPlanForm.NameAndCode,
         EquipmentId: this.AddPlanForm.EquipmentId,
-        LabelEpc: this.AddPlanForm.LabelEpc,
+        epc: this.AddPlanForm.epc,
       };
       console.log("添加物资", plan);
       obj = this.NHCruleForm.BorrowList.find(function (item) {
@@ -1318,9 +1330,9 @@ export default {
     },
      stateFormat(row) {
       if (row.IsHaoCai === 0) {
-        return "非耗材";
+        return "已贴标";
       } else  if(row.IsHaoCai===1) {
-        return "耗材";
+        return "未贴标";
       }
       else
       {
@@ -1347,12 +1359,12 @@ export default {
       console.log(row);
       if (row === 0) {
         //耗材0
-        this.title = "借用下发(耗材物资)";
+        this.title = "借用下发(未贴标物资)";
         this.addVisible = true;
         this.ruleForm.BorrowList = [];
       } //非耗材1
       else {
-        this.title = "借用下发(非耗材物资)";
+        this.title = "借用下发(已贴标物资)";
         this.NHCaddVisible = true;
         this.NHCruleForm.BorrowList = [];
       }

src/views/borrow/return.vue

@@ -20,7 +20,7 @@
               <el-breadcrumb-item :to="{ path: '/index' }"
                 >首页</el-breadcrumb-item
               >
-              <el-breadcrumb-item>借用/领用管理</el-breadcrumb-item>
+              <el-breadcrumb-item>借领管理</el-breadcrumb-item>
               <el-breadcrumb-item>归还记录</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >

src/views/borrow/user.vue

@@ -17,7 +17,7 @@
               <el-breadcrumb-item :to="{ path: '/index' }"
                 >首页</el-breadcrumb-item
               >
-              <el-breadcrumb-item>借用/领用管理</el-breadcrumb-item>
+              <el-breadcrumb-item>借领管理</el-breadcrumb-item>
               <el-breadcrumb-item>人员借用</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >

src/views/borrow/userGet.vue

@@ -17,7 +17,7 @@
               <el-breadcrumb-item :to="{ path: '/index' }"
                 >首页</el-breadcrumb-item
               >
-              <el-breadcrumb-item>借用/领用管理</el-breadcrumb-item>
+              <el-breadcrumb-item>借领管理</el-breadcrumb-item>
               <el-breadcrumb-item>领用管理</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >
@@ -898,7 +898,7 @@ export default {
 
     //下发领用
     async addRecive() {
-      this.title = "领用下发(耗材物资)";
+      this.title = "领用下发(未贴标物资)";
       this.addVisible = true;
       this.ruleForm.BorrowList = [];
       //

src/views/home.vue

@@ -15,7 +15,7 @@
           <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col" >
             <div
               class="card-panel"
-              @click="handleSetLineChartData('newVisitis')"
+              @click="handleSetLineChartData('全部')"
             >
               <div class="card-panel-icon-wrapper icon-people">
                 <img
@@ -111,7 +111,7 @@
                 />
               </div>
               <div class="card-panel-description">
-                <div class="card-panel-text">借用待审批</div>
+                <div class="card-panel-text">借待审批</div>
                 <count-to
                   :start-val="0"
                   :end-val="eqCount.h_JYWaitToExamined"
@@ -131,7 +131,7 @@
                 />
               </div>
               <div class="card-panel-description">
-                <div class="card-panel-text">领用待审批</div>
+                <div class="card-panel-text">领待审批</div>
                 <count-to
                   :start-val="0"
                   :end-val="eqCount.h_LYWaitToExamined"

src/views/log/doorLog.vue

@@ -162,9 +162,8 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.pageNo"
+            :current-page="searchData.page"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="searchData.Page"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
           />

src/views/log/outinLog.vue

@@ -17,7 +17,7 @@
               <el-breadcrumb-item :to="{ path: '/index' }"
                 >首页</el-breadcrumb-item
               >
-              <el-breadcrumb-item>借用/领用管理</el-breadcrumb-item>
+              <el-breadcrumb-item>借领管理</el-breadcrumb-item>
               <el-breadcrumb-item>出入库记录</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >
@@ -96,28 +96,31 @@
           <el-table-column prop="ID" v-if="false" />
           <el-table-column prop="PhotoUrl" v-if="false" />
           <el-table-column 
-          prop="Type" :formatter="stateFormat" label="类型" align="center" />
+          prop="Type" :formatter="stateFormat" label="类型" width="120" align="center" />
           <el-table-column
             prop="MaterielName"
             label="物料名称"
+            width="250"
             align="center"
           />
-          <el-table-column prop="EqSizeName" label="号型名称" align="center" />
-          <el-table-column prop="EquName" label="装备名称" align="center" />
-          <el-table-column prop="UserName" label="出入库人员" align="center" />
+          <el-table-column prop="EqSizeName" label="号型名称" width="200" align="center" />
+          <el-table-column prop="EquName" label="装备名称" width="250" align="center" />
+          <el-table-column prop="UserName" label="出入库人员" width="100" align="center" />
           <el-table-column
             prop="CreateTime"
             label="出入库时间"
+            width="250"
             align="center"
           />
-          <el-table-column   fixed="right" label="照片查看" width="100px" >
+          <el-table-column   fixed="right" label="照片查看"  align="center">
             <template slot-scope="scope">
-              <a-button
+              <el-button
                v-if="scope.row.PhotoUrl !== null"
                 @click="getDetailInfo(scope.row)"
                 type="primary"
-                style="font-size: 15px"
-                >预览</a-button
+                size="mini"
+                
+                >预览</el-button
               >
             </template>
           </el-table-column>

src/views/log/pdaLog.vue

@@ -177,9 +177,8 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.pageNo"
+            :current-page="searchData.page"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="searchData.Page"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
           />

src/views/log/systemLog.vue

@@ -206,9 +206,8 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.pageNo"
+            :current-page="searchData.page"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="searchData.Page"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
           />

src/views/login/Login.vue

@@ -117,7 +117,7 @@ export default {
         {
           id: 1,
           path: "/borrow",
-          menuName: "借用/领用管理",
+          menuName: "借领管理",
           icon: "资源借用",
           children: [
             {
@@ -260,7 +260,7 @@ export default {
             {
               id: 6 - 3,
               path: "/systemConfig/police",
-              menuName: "人员设置",
+              menuName: "人员管理",
               icon: "人员设置",
             },
           ],

src/views/statistics/stock.vue

@@ -114,6 +114,7 @@
           </el-table-column>
         </el-table>
         <!-- 详细信息弹出 -->
+
         <!-- <div class="ivu-divider ivu-divider-horizontal"></div> -->
         <!-- 分页功能 -->
         <el-row type="flex" justify="center" align="middle">
@@ -121,9 +122,8 @@
             background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="searchData.pageNo"
+            :current-page="searchData.page"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="searchData.Page"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
           />

src/views/systemConfig/borrowApply.vue

@@ -79,7 +79,7 @@
           style="height: 40px"
           class="funcButton"
           @click="addHCRecive()"
-          >耗材借用申请</el-button
+          >借用申请（未贴标）</el-button
         >
         <el-button
           type="primary"
@@ -87,7 +87,7 @@
           style="height: 40px; margin-right: 20px"
           class="funcButton"
           @click="addNHCRecive()"
-          >非耗材借用申请</el-button
+          >借用申请（已贴标）</el-button
         >
       </el-form>
 
@@ -251,7 +251,7 @@
             class="box-card"
             style="text-align: center; margin-top: 35px"
           >
-            <label class="labelBorrow">借用装备表(耗材)</label>
+            <label class="labelBorrow">借用装备表(未贴标)</label>
             <el-divider></el-divider>
             <template>
               <el-table :data="HctableData" border class="details">
@@ -287,7 +287,7 @@
             class="box-card"
             style="text-align: center; margin-top: 35px"
           >
-            <label class="labelBorrow">借用装备表(非耗材)</label>
+            <label class="labelBorrow">借用装备表(已贴标)</label>
             <el-divider></el-divider>
             <template>
               <el-table :data="NHctableData" border class="details">
@@ -309,6 +309,18 @@
                   align="center"
                 >
                 </el-table-column>
+                <el-table-column
+                  prop="OutTime"
+                  label="出库时间"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="ReturnTime"
+                  label="入库时间"
+                  align="center"
+                >
+                </el-table-column>
               </el-table>
             </template>
           </el-card>
@@ -832,6 +844,8 @@ export default {
         Order: "ESC",
         MaterielId: "",
         EqSizeId: "",
+        State: 0,
+        IsNoBorrow: true
       },
       classOption: [],
       MaterielOption: [],
@@ -843,7 +857,7 @@ export default {
         PlanName: "",
         PlanState: 0,
         borrowType: 1,
-        LabelEpc: "",
+        epc: "",
         BorrowList: [
           {
             MainClass: "",
@@ -890,9 +904,9 @@ export default {
         EqSizeName: "",
         
         NameAndCode: "",
-        LabelEpc: "",
+        epc: "",
         EquipmentId: "",
-        
+        State:0,
       },
       resetForm() {
         (this.eqOption = []),
@@ -1066,7 +1080,7 @@ export default {
     },
     //新增耗材申请
     async addHCRecive() {
-      this.title = "耗材借用申请";
+      this.title = "借用申请（未贴标）";
       this.HCVisible = true;
       this.HCruleForm.BorrowList = [];
       // console.log("rule",this.ruleForm)
@@ -1077,7 +1091,7 @@ export default {
     },
     //新增借用申请
     async addNHCRecive() {
-      this.title = "非耗材借用申请";
+      this.title = "借用申请（已贴标）";
       this.addVisible = true;
       this.ruleForm.BorrowList = [];
       // console.log("rule",this.ruleForm)
@@ -1092,7 +1106,7 @@ export default {
       if (row.IsHaoCai === 0) {
         //非耗材
         this.addVisible = true;
-        this.title = "修改非耗材借用申请";
+        this.title = "修改借用申请（已贴标）";
         this.addVisible = true;
         var url = "api/Borrow/" + row.ID;
         const { data: res } = await this.$axios.get(url);
@@ -1104,7 +1118,7 @@ export default {
         this.classOption = resclass.Rows;
       } else {
         //耗材
-        this.title = "修改耗材借用申请";
+        this.title = "修改借用申请（未贴标）";
         this.HCVisible = true;
         var url = "api/Borrow/" + row.ID;
         const { data: res } = await this.$axios.get(url);
@@ -1165,7 +1179,7 @@ export default {
         });
         this.AddPlanForm.EquipmentId = obj.ID;
         this.AddPlanForm.NameAndCode = obj.NameAndCode;
-        this.AddPlanForm.LabelEpc = obj.LabelEpc;
+        this.AddPlanForm.epc = obj.LabelEpc;
       }
     },
     //获取号型的名字和ID
@@ -1335,7 +1349,7 @@ export default {
         EqSizeCode: this.AddPlanForm.EqSizeCode,
         NameAndCode: this.AddPlanForm.NameAndCode,
         EquipmentId: this.AddPlanForm.EquipmentId,
-        LabelEpc: this.AddPlanForm.LabelEpc,
+        epc: this.AddPlanForm.epc,
       };
       console.log("添加物资", plan);
       obj = this.ruleForm.BorrowList.find(function (item) {
@@ -1433,7 +1447,7 @@ export default {
     },
     //耗材提交数据
     HcsubmitForm(formName, type) {
-      console.log("HC",this.HCruleForm);
+     // console.log("HC",this.HCruleForm);
       if (this.HCruleForm.BorrowList.length === 0) {
         return this.$message.warning("请添加装备");
       }
@@ -1444,7 +1458,7 @@ export default {
       const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          if (type === "耗材借用申请") {
+          if (type === "借用申请（未贴标）") {
             const { data: res } = await this.$axios.post(
               borrowUrl,
               this.HCruleForm
@@ -1479,7 +1493,7 @@ export default {
       const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          if (type === "非耗材借用申请") {
+          if (type === "借用申请（已贴标）") {
             const { data: res } = await this.$axios.post(
               borrowUrl,
               this.ruleForm
@@ -1557,9 +1571,9 @@ export default {
     },
     stateFormat(row) {
       if (row.IsHaoCai === 0) {
-        return "非耗材";
+        return "已贴标";
       } else if (row.IsHaoCai === 1) {
-        return "耗材";
+        return "未贴标";
       } else {
         return "";
       }

src/views/systemConfig/equipmentInfo.vue

@@ -34,7 +34,7 @@
         label-position="left"
       >
         <el-input
-          v-model="searchData.EqName"
+          v-model="searchData.MaterielName"
           @keypress.native.enter="onEnterPress"
           ref="nameInput"
           style="width: 200px"
@@ -61,7 +61,7 @@
           v-model="searchData.IsHaoCai"
           filterable
           clearable
-          placeholder="请选择是否为耗材"
+          placeholder="请选择是否贴标"
         >
           <el-option
             v-for="item in optionsEquipment"
@@ -188,9 +188,9 @@
                     <td class="textContent">
                       {{ detailData.TermDays }}
                     </td>
-                    <th class="textHeader">所否为消耗品</th>
+                    <th class="textHeader">是否贴标</th>
                     <td class="textContent">
-                      {{ detailData.IsHaoCai == 1 ? "是" : "否" }}
+                      {{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
                     </td>
                     <th class="textHeader">数量</th>
                     <td class="textContentLast">
@@ -286,10 +286,10 @@
                   </el-form-item>
                   <el-form-item class="diaB" label="是否贴标">
                     <el-radio v-model="EditRuleForm.IsHaoCai" :label="1"
-                      >是</el-radio
+                      >否</el-radio
                     >
                     <el-radio v-model="EditRuleForm.IsHaoCai" :label="0"
-                      >否</el-radio
+                      >是</el-radio
                     >
                   </el-form-item>
 
@@ -448,11 +448,11 @@ export default {
         },
         {
           value: "1",
-          label: "耗材",
+          label: "未贴标",
         },
         {
           value: "0",
-          label: "非耗材",
+          label: "已贴标",
         },
       ],
 
@@ -749,7 +749,7 @@ export default {
       this.getQueuData();
     },
     stateFormat(row) {
-      if (row.EqHaoCai === 0) {
+      if (row.IsHaoCai == 0) {
         return "已贴标";
       } else {
         return "未贴标";

src/views/systemConfig/police.vue

@@ -10,7 +10,7 @@
             <img src="../../assets/icons/3D库房.png" class="logo" alt="logo"
           /></el-col>
           <el-col :span="2"
-            ><span class="fontStyle">人员设置</span><br /><span></span>
+            ><span class="fontStyle">人员管理</span><br /><span></span>
           </el-col>
           <el-col :span="20">
             <el-breadcrumb separator-class="el-icon-arrow-right">
@@ -18,7 +18,7 @@
                 >首页</el-breadcrumb-item
               >
               <el-breadcrumb-item>系统设置 </el-breadcrumb-item>
-              <el-breadcrumb-item>人员设置</el-breadcrumb-item>
+              <el-breadcrumb-item>人员管理</el-breadcrumb-item>
             </el-breadcrumb></el-col
           >
         </el-row>
@@ -97,7 +97,7 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="PoliceTypeName"
+            prop="PoliceCategoryldName"
             label="所属所属警种"
             align="center"
           ></el-table-column>

src/views/systemConfig/receiveApply.vue

@@ -753,7 +753,7 @@ export default {
     },
     //新增领用申请
     async addRecive() {
-      this.title = "领用申请(耗材物资)";
+      this.title = "领用申请(未贴标物资)";
       this.addVisible = true;
       this.ruleForm.BorrowList = [];
       // console.log("rule",this.ruleForm)
@@ -956,7 +956,7 @@ export default {
       const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
       this.$refs[formName].validate(async (valid) => {
         if (valid) {
-          if (type === "领用申请(耗材物资)") {
+          if (type === "领用申请(未贴标物资)") {
             const { data: res } = await this.$axios.post(
               borrowUrl,
               this.ruleForm

src/views/warehouse/warehouseInventory.vue

@@ -190,7 +190,7 @@
                 :data="fixData"
                 v-model="activeName"
               >
-                <el-tab-pane
+                <!-- <el-tab-pane
                   label="已盘点装备"
                   name="first"
                   v-loading="tabLoading"
@@ -201,8 +201,11 @@
                     <el-table-column prop="EqName" label="装备名称">
                     </el-table-column>
                     <el-table-column prop="CategoryName" label="所属物料">
-                    </el-table-column> </el-table
-                  ><el-row type="flex" justify="center" align="middle">
+                    </el-table-column>
+                    <el-table-column prop="CategoryName" label="所属物料">
+                    </el-table-column> 
+                    </el-table>
+                    <el-row type="flex" justify="center" align="middle">
                     <el-pagination
                       background
                       @size-change="handleSizeAlreadyChange"
@@ -213,14 +216,16 @@
                       :total="alreadyToal"
                     />
                   </el-row>
-                </el-tab-pane>
+                </el-tab-pane> -->
 
-                <el-tab-pane label="未盘点装备" name="second"
+                <el-tab-pane label="未盘点装备" name="first"
                   ><el-table :data="InvetoryNoList" border class="details">
                     <el-table-column prop="EqName" label="装备名称">
                     </el-table-column>
                     <el-table-column prop="CategoryName" label="所属物料">
                     </el-table-column>
+                    <el-table-column prop="LocationCode" label="存放位置">
+                    </el-table-column>
                   </el-table>
                   <el-row type="flex" justify="center" align="middle">
                     <el-pagination

vue.config.js

@@ -5,10 +5,10 @@ function resolve (dir) {
 module.exports = {
   publicPath: '/',
   devServer: {
-    //  host: '192.168.3.1',
-    //   port: 2233,
-      host: '192.168.2.105',
-      port: 2234,
+     host: '192.168.2.246',
+      port: 2233,
+      // host: '192.168.2.105',
+      // port: 2234,
        // host: '192.168.2.101',
       // host: '41.204.124.248',
       // port: 5002,