Skip to content

A
assets
Commit 7813ad68 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改样式

parent 1124f12b
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 18 deletions
src/components/Materialman/chukudan.vue
View file @ 7813ad68
...@@ -194,14 +194,15 @@ ...@@ -194,14 +194,15 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="min-width: 1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="min-width: 1200px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>档案编码</th> <th width="90px">档案编码</th>
<th>物料名称</th> <th>物料名称</th>
<th>分类名称</th> <th width="130px">规格</th>
<th>品牌</th> <th width="100px">分类名称</th>
<th>当前库存</th> <th width="120px">品牌</th>
<th width="100px">当前库存</th>
<th width="80px"><span class="cred">*出库数量</span></th> <th width="80px"><span class="cred">*出库数量</span></th>
<th width="120px">备注</th> <th width="120px">备注</th>
</thead> </thead>
...@@ -212,6 +213,9 @@ ...@@ -212,6 +213,9 @@
</td> </td>
<td>{{item.SuppliesNum}}</td> <td>{{item.SuppliesNum}}</td>
<td>{{item.SuppliesName}}</td> <td>{{item.SuppliesName}}</td>
<td>
<p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
<td>{{item.InventoryNum}}</td> <td>{{item.InventoryNum}}</td>
......
src/components/Materialman/rukudan.vue
View file @ 7813ad68
...@@ -185,13 +185,14 @@ ...@@ -185,13 +185,14 @@
</span> </span>
</div> </div>
<div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px"> <div class="myScroll" style="overflow:scroll;max-height:300px;margin-top:20px">
<table style="width:1000px;min-width: 1000px;" class="myTable" border="0" cellspacing="0" cellpadding="0"> <table style="width:1200px;min-width: 1200px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th> <th><input class="color-input-red" type="checkbox" v-model="ItemisCkedAll" @click='ItemcheckAll()'></th>
<th>档案编码</th> <th width="90px">档案编码</th>
<th>物料名称</th> <th width="300px">物料名称</th>
<th>分类名称</th> <th width="130px">规格</th>
<th>品牌</th> <th width="90px">分类名称</th>
<th width="90px">品牌</th>
<th width="100px"><span class="cred">*单价</span></th> <th width="100px"><span class="cred">*单价</span></th>
<th width="100px"><span class="cred">*入库数量</span></th> <th width="100px"><span class="cred">*入库数量</span></th>
<th width="100px"><span class="cred">*入库金额</span></th> <th width="100px"><span class="cred">*入库金额</span></th>
...@@ -204,6 +205,9 @@ ...@@ -204,6 +205,9 @@
</td> </td>
<td>{{item.SuppliesNum}}</td> <td>{{item.SuppliesNum}}</td>
<td>{{item.SuppliesName}}</td> <td>{{item.SuppliesName}}</td>
<td>
<p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<td>{{item.CategoryName}}</td> <td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td> <td>{{item.BrandName}}</td>
<td><el-input @input="UnitPriceChange(item,index)" v-model="item.UnitPrice"></el-input></td> <td><el-input @input="UnitPriceChange(item,index)" v-model="item.UnitPrice"></el-input></td>
......
src/components/assetsman/outboundDetails.vue
View file @ 7813ad68
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</el-form> </el-form>
</div> </div>
<div> <div>
<el-button v-if="tableData.ApplyStatus==1" class='butoons' type="primary" round @click="See(2)">审核</el-button> <el-button v-if="tableData.ApplyStatus==1" class='butoons' type="primary" round @click="See(2)">通过</el-button>
<el-button v-if="tableData.ApplyStatus==1" class='butoons' type="danger" round @click="See(3)">拒绝</el-button> <el-button v-if="tableData.ApplyStatus==1" class='butoons' type="danger" round @click="See(3)">拒绝</el-button>
</div> </div>
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
<vxe-table-column field="Name" title="出库状态" width='180'> <vxe-table-column field="Name" title="出库状态" width='180'>
<template v-slot="{ row }"> <template v-slot="{ row }">
<span class="commonStyle hoverSpan1"></span> <span class="commonStyle hoverSpan1"></span>
<span v-if="row.IsOut==0" style='height:26px;line-height:26px'>未出库</span> <span v-if="row.IsOut==0" style="height:26px;line-height:26px;color:#ff7874">未出库</span>
<span v-if="row.IsOut==1" style='height:26px;line-height:26px'>已出库</span> <span v-if="row.IsOut==1" style='height:26px;line-height:26px;color:#67C23A'>已出库</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
......
src/plugins/index.js
View file @ 7813ad68
...@@ -12,9 +12,8 @@ export default { ...@@ -12,9 +12,8 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
// var domainUrl = "http://test_reborn.oytour.com";//主域名 // var domainUrl = "http://test_reborn.oytour.com";//主域名
// var domainUrl = "http://reborn.oytour.com"; //主域名 var domainUrl = "http://reborn.oytour.com"; //主域名
var domainUrl = "http://192.168.2.17:8087"; //主域名 // var domainUrl = "http://192.168.2.16:8087"; //主域名
domainUrl = "http://192.168.2.65";
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo = ""; let javaUrldo = "";
javaUrldo = locationName.indexOf('zcyx') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087"; javaUrldo = locationName.indexOf('zcyx') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087";
...@@ -37,8 +36,8 @@ export default { ...@@ -37,8 +36,8 @@ export default {
// javaUrl: locationName.indexOf('zcyx') == -1 ? "http://property.oytour.com" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087", // javaUrl: locationName.indexOf('zcyx') == -1 ? "http://property.oytour.com" : locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://property.oytour.com" : "http://192.168.2.17:8087",
// javaUrl: "http://192.168.2.65:8018", // javaUrl: "http://192.168.2.65:8018",
javaUrl: "http://192.168.2.16:8087", // javaUrl: "http://192.168.2.16:8087",
// javaUrl: "http://property.oytour.com", javaUrl: "http://property.oytour.com",
ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('zcyx') !== -1 || locationName.indexOf('zcyx.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
// UploadUrl: "http://uploadfile.oytour.com", // UploadUrl: "http://uploadfile.oytour.com",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment