更新

src/views/contractManagement/acquisitionContractAdd.vue

@@ -871,7 +871,7 @@ import { isUndefined } from 'xe-utils/methods'
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 20000000
         ) {
           this.$message({
             message: '输入重量有误！',

src/views/contractManagement/purchaseContractAdd.vue

@@ -1206,7 +1206,7 @@ import { isUndefined } from 'xe-utils/methods'
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 20000000
         ) {
           this.$message({
             message: '输入重量有误！',

src/views/contractManagement/salesContractAdd.vue

@@ -1070,7 +1070,7 @@
             (String(this.deptBudgetList.weight).indexOf('.') + 1) >
             3) ||
           this.deptBudgetList.weight < 0 ||
-          this.deptBudgetList.weight > 200000
+          this.deptBudgetList.weight > 20000000
         ) {
           this.$message({
             message: '输入重量有误！',

src/views/home/index.vue

@@ -41,10 +41,10 @@
         </ItemWrap>
         </div>
         <div v-if="this.compId=='258fba198eea4cd1a5eddc71ba421b4a'" >
-          <ItemWrap class="contetn_left-center contetn_lr-item " title="快捷跳转">
-            
-            <el-button @click="obd()" style="margin-left: 100px; margin-top: 60px;" type="primary">obd后台控制中心</el-button>
-            <el-button @click="obd2()" style="margin-left: 100px !important; margin-top: 20px;" type="primary">扫码机后台数据中心</el-button>
+          <ItemWrap class="contetn_left-center contetn_lr-item " title="车辆管理">
+            <el-button @click="obd5()" style="margin-left: 205px; margin-top: 40px;" type="primary">智联锁</el-button>
+            <el-button @click="obd()" style="margin-left: 175px !important; margin-top: 20px;"  type="primary">obd后台控制中心</el-button>
+            <el-button @click="obd2()" style="margin-left: 167px !important; margin-top: 20px;" type="primary">扫码机后台数据中心</el-button>
           </ItemWrap>
            
         </div>
@@ -53,11 +53,16 @@
           <LeftCenter :hylistData="leftCenterDataList"/>
         </ItemWrap>
         </div>
-        <div @click="routergo(3)">
+        <div v-if="this.compId=='258fba198eea4cd1a5eddc71ba421b4a'" >
+          <ItemWrap class="contetn_left-center contetn_lr-item " title="合同签署">
+            <el-button @click="obd4()" style="margin-left: 205px; margin-top: 60px;" type="primary">电子会签</el-button>
+          </ItemWrap>
+        </div>
+        <div v-else @click="routergo(3)">
         <ItemWrap class="contetn_left-bottom contetn_lr-item" title="车辆信息" style="padding: 0 10px 16px 10px">
           <LeftBottom :ztxxlistData="leftBottomDataList"/>
         </ItemWrap>
-      </div>
+        </div>
       </div>
       <div class="contetn_center">
         <div class="maptitle">
@@ -68,7 +73,13 @@
         <dv-border-box-13>
           <div id="china-map"></div>
         </dv-border-box-13>
-        <dv-border-box-1 class="center_bottom">
+        <div v-if="this.compId=='258fba198eea4cd1a5eddc71ba421b4a'" >
+          <ItemWrap class="contetn_left-center contetn_lr-item " title="外勤管理">
+            <el-button @click="obd6()" style="margin-left: 285px; margin-top: 40px;" type="primary">外勤助手</el-button>
+          </ItemWrap>
+           
+        </div>
+        <dv-border-box-1 v-else class="center_bottom">
           <div @click="routergo(2)" class="center_bottom_content">
             <div class="item">
               <div class="title">头寸</div>
@@ -128,9 +139,20 @@
           <RightCenter :phklistData="rightCenterDataList"/>
         </ItemWrap>
         </div>
-        <ItemWrap class="contetn_left-bottom contetn_lr-item" title="最新合同 ">
-          <RightBottom :htlistData="rightBottomDataList"/>
-        </ItemWrap>
+         <div v-if="this.compId=='258fba198eea4cd1a5eddc71ba421b4a'" >
+          <ItemWrap class="contetn_left-center contetn_lr-item " title="仓库管理">
+            
+            <el-button @click="obd3()" style="margin-left: 155px; margin-top: 60px;" type="primary">库存盘点</el-button>
+            <el-button @click="obd7()" style="margin-left: 180px; margin-top: 60px;" type="primary">日志台账</el-button>
+          </ItemWrap>
+           
+        </div>
+        <div v-else>
+           <ItemWrap class="contetn_left-bottom contetn_lr-item" title="最新合同 ">
+            <RightBottom :htlistData="rightBottomDataList"/>
+          </ItemWrap>
+        </div>
+       
       </div>
     </div>
   </div>
@@ -210,6 +232,21 @@ export default {
     obd2(){
         window.open('http://139.159.186.154:18998/1112_jxc_a1_sr/','_blank')
       },
+    obd3(){
+      window.open('http://srwl-4d.sinok.com.cn','_blank')
+    },
+    obd4(){
+      window.open('https://h5.esign.cn/usercenterFront/login/web?session=17bdc0d5-0ea1-4df7-9838-cd63bf8d83b6&cusRedirectUrl=https%3A%2F%2Fweb.esign.cn%2Fworkspace%2Fhome','_blank')
+    },
+    obd5(){
+      window.open('https://api.secrfire.com/app/deviceInfo','_blank')
+    },
+    obd6(){
+      window.open('http://cms7.xiaobuwq.com/wq/admin/core/index/index','_blank')
+    },
+    obd7(){
+      window.open('http://www.shenrongwuliu.com/workflow/index.php','_blank')
+    },
     routergo(status){
       if(status==1){
         this.$router.push({name:'autoSettlementList',query:{status:true}})

src/views/profitable/expensemanagementdetails.vue

@@ -169,7 +169,7 @@
             <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-show="scope.row.addressUrlArray != null">
+              <span v-if="scope.row.addressUrlArray">
                 {{
                   scope.row.addressUrlArray.length == 0
                     ? ''

src/views/warehousenew/component/router/index.js

@@ -532,7 +532,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'gooddetail',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
+        module: 'warehouseManagement.warehousingOrder',
         permissicon: [],
         keepAlive: true,
         _title:'货权明细'
@@ -547,7 +547,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'inspectionRecords',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
+        module: 'warehouseManagement.warehousingOrder',
         permissicon: [],
         keepAlive: true,
         _title:'巡检记录'

src/views/warehousenew/warehouseManagementList.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="container">
     <!-- 表格 -->
-    <div class="top_form" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`">
+    <div v-if="this.compId=='!258fba198eea4cd1a5eddc71ba421b4a'" class="top_form" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`">
       <div style='position:relative;' class="title">
         <span style="font-size:18px;font-weight: 600;margin-left:20px">今日储量明细</span><span style="color:#8890B1;font-size:16px">（{{dateTime}}）</span>
         <ws-button type="primary" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleall()" style="margin-left:20px;position:absolute;right:10px;top:50%;transform: translateY(-50%);">库存明细</ws-button>
@@ -16,7 +16,7 @@
         <el-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
           <div class="title"><span class="cangInfo">仓库信息</span></div>
           <!-- 仓储部负责人 -->
-          <el-form-item label-width="120px" label="仓储部负责人" span="1" prop="acceptanceMethod">
+          <el-form-item v-if="this.compId=='!258fba198eea4cd1a5eddc71ba421b4a'" label-width="120px" label="仓储部负责人" span="1" prop="acceptanceMethod">
              <el-input v-model="responsible" placeholder="暂无" maxlength="100" size="small" disabled/>
           </el-form-item>
           <!--仓库名称-->
@@ -44,7 +44,7 @@
                <el-input v-model="warehouseInfo.personCharge" placeholder="暂无" maxlength="100" size="small" disabled/>
           </el-form-item>
           <!--其他负责人-->
-          <el-form-item label-width="120px" label="其他驻库人员" span="1" prop="otherPersonCharge">
+          <el-form-item v-if="this.compId=='!258fba198eea4cd1a5eddc71ba421b4a'" label-width="120px" label="其他驻库人员" span="1" prop="otherPersonCharge">
             <!-- <el-select v-model="WarehouseInfo.otherPersonPhone" placeholder="暂无" @change="selectstaffOther" multiple filterable clearable collapse-tags disabled> -->
                <el-input v-model="warehouseInfo.otherPersonCharge" placeholder="暂无" maxlength="100" size="small" disabled/>
           </el-form-item>
@@ -68,8 +68,8 @@
         <div v-for="(item , index) in totalReserves" :key="index" class="reservesInfo">
           <div class="reservesInfo_item" v-if="warehouseType == '1'"><div class="reservesInfo_GoodsName">{{item.goodsName}}</div>
           <span class="reservesInfo_Amount">{{item.stockNum == 0 ? "-":item.stockNum}}(吨)</span><br/>
-          <span v-if="item.stockNum&&item.cost" class="reservesInfo_Amount">{{item.cost == 0 ? "-":item.cost}}(元/吨)</span>
-          <span v-else class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span><br/>
+          <span v-if="item.stockNum&&item.cost&&compId!='258fba198eea4cd1a5eddc71ba421b4a'" class="reservesInfo_Amount">{{item.cost == 0 ? "-":item.cost}}(元/吨)</span>
+          <span v-else-if="compId!='258fba198eea4cd1a5eddc71ba421b4a'" class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span><br/>
           <div style="display:grid">
             <span v-if="item.cargoWeight && item.cargoWeight != 0" class="reservesInfo_Amount">含转入:{{ item.cargoWeight }}(吨)</span>
             <span v-if="item.redemptionWeight && item.redemptionWeight != 0" class="reservesInfo_Amount">待赎回:{{ item.redemptionWeight }}(吨)</span>
@@ -81,7 +81,39 @@
         </div>
       </div>
       </div>
-    <div class="position">
+    <div v-if="this.compId=='258fba198eea4cd1a5eddc71ba421b4a'" class="map">
+        <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">{{maptitle}}</span></div>
+        <div class="map_switch">
+          <div :class="btnCss1" @click="mapChange(1)" v-if="warehouseType == '1'">监控</div>
+          <div :class="btnCss2" @click="mapChange(2)">定位</div>
+        </div>
+        <div class="map-item" v-if="mapshow && warehousePositioning.lat && warehousePositioning.lng">
+          <map-drag @marker="marker" ref="childMap" :isShowaddress='true' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' :warehousePositioning="warehousePositioning"></map-drag>
+        </div>
+        <div v-if="!mapshow && warehouseType == '1'" class="monitor">
+          <!-- <div v-if="!monitorUrl1" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+            <div>监控视频未连接</div>
+          </div>
+          <div v-else class="video1">
+            <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+          <div v-if="!monitorUrl2" class="video1">
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
+            <div>监控视频未连接</div>
+          </div>
+          <div v-else class="video2">
+            <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
+          </div> -->
+          <div v-for="(item , index) in monitorList" :key="index" class="video1">
+            <iframe :src="item" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
+          </div>
+        </div>
+    </div>
+    <div v-if="this.compId=='!258fba198eea4cd1a5eddc71ba421b4a'" class="position">
       <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">当期储量</span></div>
       <ws-button type="primary" @click="handleAdd()" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.add`" style="margin-left:20px">添加</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="handleLook()">查看</ws-button>
@@ -186,7 +218,112 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="map">
+    <div v-else v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" class="position">
+      <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">当期储量</span></div>
+      <ws-button type="primary" @click="handleAdd()" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.add`" style="margin-left:20px">添加</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view` " @click="handleLook()">查看</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.edit` " @click="handleEdit()">编辑</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" @click="handleDelete()">删除</ws-button>
+      <ws-button v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`" @click="record()">记录</ws-button>
+      <!-- <ws-button v-if="warehouseType == '1'" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view`" @click="loss()">盘库</ws-button> -->
+      <ws-button v-if="warehouseInfo.clearStatusFlag == 1 && warehouseType == '2'" @click="clearance()">清库</ws-button>
+      <ws-button v-if="warehouseInfo.clearStatusFlag == 3 && warehouseType == '2'" disabled> 已清库</ws-button>
+      <!-- createType 1手动创建 2 自动创建 -->
+      <ws-button v-if='warehouseInfo.createType==1' v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" @click="indialog = true">入库量</ws-button>
+      <ws-button v-if='list.length>0' @click="handlTask()">任务</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.add`" @click="outData(1)">导出</ws-button>
+      <ws-button @click="outData(2)">打印</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="exportHistoricalData()">导出历史库存记录</ws-button>
+      <ws-button @click="transformation()" v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`">折转</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleall()">全部仓库</ws-button>
+      <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleMintor()">查看监控</ws-button>
+      <ws-button @click="dryClick()">烘干入库</ws-button>
+      <ws-button @click="materialInOut()">物料出入库</ws-button>
+        <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi setUp_css" :data="warehouseList" style="width: 100%; margin-top: 20px" height="calc(100% - 45px)" v-if="warehouseType == '1'">
+        <el-table-column prop="warehouseName" label="仓库名">
+        </el-table-column>
+        <el-table-column prop="binNumber" label="仓位编号">
+        </el-table-column>
+        <el-table-column prop="capacity" label="容量（吨）">
+          <template slot-scope="scope">
+            <div v-if="scope.row.capacity != 'null' && scope.row.capacity != null">
+              {{ scope.row.capacity }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="货名">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.goodsName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{item.inNetWeight}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.outNetWeight == 0 ? "0":Number(item.outNetWeight).toFixed(3)}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="应余量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.storage}}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 临时库 -->
+      <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="calc(100% - 45px)" v-if="warehouseType == '2'">
+        <el-table-column prop="warehouseName" label="仓库名">
+        </el-table-column>
+        <el-table-column prop="binNumber" label="仓位编号">
+        </el-table-column>
+        <el-table-column prop="capacity" label="容量（吨）">
+          <template slot-scope="scope">
+            <div v-if="scope.row.capacity != 'null' && scope.row.capacity != null">
+              {{ scope.row.capacity }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="货名">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.goodsName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{item.inNetWeight}}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.outNetWeight }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="应余量（吨）">
+          <template slot-scope="scope">
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList" :key="i">
+              {{ item.surplus }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div v-if="this.compId!='258fba198eea4cd1a5eddc71ba421b4a'" class="map">
         <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">{{maptitle}}</span></div>
         <div class="map_switch">
           <div :class="btnCss1" @click="mapChange(1)" v-if="warehouseType == '1'">监控</div>
@@ -412,11 +549,13 @@
         warehousePositioning:{},
         monitorUrl1:'',
         monitorUrl2:'',
+        monitorList:[],
         goodnameList:[]
       }
     },
     activated() {
       this.tableData = []
+      this.monitorList = []
       this.getList()
       //  this.$refs.childMap.clearVal()
       this.showType = this.isShow
@@ -922,12 +1061,16 @@
         })
       },
       selectstaff(e){
+        this.monitorList = []
         this.warehouseInfo.warehouseName = e
         for(var tmp = 0 ; tmp < this.warehouseAllXiaLa.length; tmp++){
           if(this.warehouseAllXiaLa[tmp].warehouseName == e){
             this.warehouseType = this.warehouseAllXiaLa[tmp].warehouseType
             this.monitorUrl1 = this.warehouseAllXiaLa[tmp].monitorUrl1
             this.monitorUrl2 = this.warehouseAllXiaLa[tmp].monitorUrl2
+            if(this.warehouseAllXiaLa[tmp].monitorUrl1){
+              this.monitorList = this.warehouseAllXiaLa[tmp].monitorUrl1.split(',')
+            }
             if(this.warehouseType == '2'){
               this.maptitle = '定位'
               this.btnCss2 ='btn1'
@@ -1233,6 +1376,9 @@
                 this.warehouseInfo.warehouseName = this.warehouseXiaLa[0].warehouseName
                 this.monitorUrl1 = this.warehouseXiaLa[0].monitorUrl1
                 this.monitorUrl2 = this.warehouseXiaLa[0].monitorUrl2
+                if(this.warehouseXiaLa[0].monitorUrl1){
+                  this.monitorList = this.warehouseXiaLa[0].monitorUrl1.split(',')
+                }
                 for(var tmp = 0 ; tmp < response.length ; tmp++){
                   if(response[tmp].warehouseType == '2'){
                     response[tmp].warehouseName = response[tmp].warehouseName + ' （临）'
@@ -1549,7 +1695,7 @@
 .map{
   background: #ffffff;
   width: 99%;
-  margin: 100px auto 50px;
+  margin: 0px auto 50px;
   height: 560px;
   border-radius: 4px;
   .map_switch{