liupopo 2 years ago
parent
commit
23663abc44
  1. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java
  2. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java
  3. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java
  4. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java
  5. 1
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java
  6. 4
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java
  7. 4
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java
  8. 5
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java
  9. 4
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java
  10. 8
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java
  11. 8
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java
  12. 8
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java
  13. 8
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java
  14. 10
      yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java
  15. 5
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java
  16. 7
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml
  17. 12
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java
  18. 11
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java
  19. 5
      yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml
  20. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  21. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue
  22. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue
  23. 79
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue
  24. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue
  25. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue
  26. 82
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue
  27. 8
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecord.java

@ -20,5 +20,6 @@ public class CrudeOilInventoryRecord extends BaseEntity {
private String tankSid; private String tankSid;
//记录时间 //记录时间
private String recordDate; private String recordDate;
private double height;
} }

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDetailsVo.java

@ -20,4 +20,5 @@ public class CrudeOilInventoryRecordDetailsVo implements Vo {
private String tankSid; private String tankSid;
//记录时间 //记录时间
private String recordDate; private String recordDate;
private double height;
} }

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordDto.java

@ -19,4 +19,5 @@ public class CrudeOilInventoryRecordDto implements Dto {
private String tankSid; private String tankSid;
//记录时间 //记录时间
private String recordDate; private String recordDate;
private double height;
} }

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordQuery.java

@ -22,4 +22,5 @@ public class CrudeOilInventoryRecordQuery implements Query {
private String recordDate; private String recordDate;
private String date; private String date;
private String number; private String number;
private double height;
} }

1
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoilinventoryrecord/CrudeOilInventoryRecordVo.java

@ -21,4 +21,5 @@ public class CrudeOilInventoryRecordVo implements Vo {
//记录时间 //记录时间
private String recordDate; private String recordDate;
private String tankNumber; private String tankNumber;
private double height;
} }

4
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutbound.java

@ -17,8 +17,8 @@ public class CrudeOilOutbound extends BaseEntity {
private String salesContractNumber; private String salesContractNumber;
//签订时间 //签订时间
private String contractSigningDate; private String contractSigningDate;
//流量计sid //油罐sid
private String flowmeterSid; private String tankSid;
//净重 //净重
private double weight; private double weight;
//价值 //价值

4
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDetailsVo.java

@ -19,8 +19,8 @@ public class CrudeOilOutboundDetailsVo implements Vo {
private String salesContractNumber; private String salesContractNumber;
//签订时间 //签订时间
private String contractSigningDate; private String contractSigningDate;
//流量计sid //油罐sid
private String flowmeterSid; private String tankSid;
//净重 //净重
private double weight; private double weight;
//价值 //价值

5
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundDto.java

@ -18,13 +18,12 @@ public class CrudeOilOutboundDto implements Dto {
private String salesContractNumber; private String salesContractNumber;
//签订时间 //签订时间
private String contractSigningDate; private String contractSigningDate;
//流量计sid
private String flowmeterSid;
//净重 //净重
private double weight; private double weight;
//价值 //价值
private String value; private double value;
private String remarks; private String remarks;
//出库时间 //出库时间
private String deliveryDate; private String deliveryDate;
private String tankSid;
} }

4
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/crudeoiloutbound/CrudeOilOutboundQuery.java

@ -19,8 +19,8 @@ public class CrudeOilOutboundQuery implements Query {
private String contractNumber; private String contractNumber;
//签订时间 //签订时间
private String contractSigningDate; private String contractSigningDate;
//流量计sid //油罐sid
private String flowmeterSid; private String tankSid;
//净重 //净重
private double weight; private double weight;
//价值 //价值

8
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformation.java

@ -26,4 +26,12 @@ public class TankInformation extends BaseEntity {
private double initialInventory=0; private double initialInventory=0;
//油罐现有库存 //油罐现有库存
private double existingInventory=0; private double existingInventory=0;
//流量计sid
private String flowmeterSid;
//油的密度
private double density;
//底面积
private double bottomArea;
//高度
private double height;
} }

8
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDetailsVo.java

@ -26,4 +26,12 @@ public class TankInformationDetailsVo implements Vo {
private double initialInventory; private double initialInventory;
//油罐现有库存 //油罐现有库存
private double existingInventory; private double existingInventory;
//流量计sid
private String flowmeterSid;
//油的密度
private String density;
//底面积
private String bottomArea;
//高度
private String height;
} }

8
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationDto.java

@ -26,4 +26,12 @@ public class TankInformationDto implements Dto {
private double initialInventory; private double initialInventory;
//油罐现有库存 //油罐现有库存
private double existingInventory; private double existingInventory;
//流量计sid
private String flowmeterSid;
//油的密度
private String density;
//底面积
private String bottomArea;
//高度
private String height;
} }

8
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationQuery.java

@ -26,4 +26,12 @@ public class TankInformationQuery implements Query {
private double initialInventory; private double initialInventory;
//油罐现有库存 //油罐现有库存
private double existingInventory; private double existingInventory;
//流量计sid
private String flowmeterSid;
//油的密度
private String density;
//底面积
private String bottomArea;
//高度
private String height;
} }

10
yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/tankinformation/TankInformationVo.java

@ -30,4 +30,14 @@ public class TankInformationVo implements Vo {
private double initialInventory; private double initialInventory;
//油罐现有库存 //油罐现有库存
private double existingInventory; private double existingInventory;
//流量计sid
private String flowmeterSid;
//油的密度
private String density;
//底面积
private String bottomArea;
//高度
private String height;
private String flowmeterName;
private String flowmeterNumber;
} }

5
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilinventoryrecord/CrudeOilInventoryRecordService.java

@ -49,11 +49,12 @@ public class CrudeOilInventoryRecordService extends MybatisBaseService<CrudeOilI
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
Date curDate = new Date(); Date curDate = new Date();
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
entity.setRecordDate(dfmt); entity.setRecordDate(dfmt);
entity.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
baseMapper.insert(entity); baseMapper.insert(entity);
//油罐每日填写信息修改 //油罐每日填写信息修改
TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid()); tank.setExistingInventory(dto.getHeight()*tank.getBottomArea()*tank.getDensity());
tank.setExistingInventory(dto.getExistingInventory());
tankInformationMapper.updateById(tank); tankInformationMapper.updateById(tank);
return rb.success().setMsg("新增成功"); return rb.success().setMsg("新增成功");
} }

7
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundMapper.xml

@ -5,13 +5,12 @@
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo"> <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.crudeoiloutbound.CrudeOilOutboundVo">
SELECT SELECT
*,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.name as flowmeterName, *,t.number as tankNumber,i.number as crudeNumber,i.name as crudeName,t.inventory as inventory,f.number as flowmeterNumber ,f.name as flowmeterName
f.number as flowmeterNumber
FROM FROM
crude_oil_outbound c crude_oil_outbound c
left join flowmeter_information f on f.sid=c.flowmeterSid left join tank_information t on t.sid =c.tankSid
left join tank_information t on t.sid =f.tankSid
left join crude_oil_type_information i on i.sid =t.crudeSid left join crude_oil_type_information i on i.sid =t.crudeSid
left join flowmeter_information f on f.sid =t.flowmeterSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

12
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoiloutbound/CrudeOilOutboundService.java

@ -41,7 +41,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
CrudeOilOutboundQuery query = pq.getParams(); CrudeOilOutboundQuery query = pq.getParams();
QueryWrapper<CrudeOilOutbound> qw = new QueryWrapper<>(); QueryWrapper<CrudeOilOutbound> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getDate())) { if (StringUtils.isNotBlank(query.getDate())) {
qw.eq("STR_TO_DATE(c.deliverDate,'%Y-%m-%d')", query.getDate()); qw.eq("STR_TO_DATE(c.deliveryDate,'%Y-%m-%d')", query.getDate());
} }
if (StringUtils.isNotBlank(query.getContractNumber())) { if (StringUtils.isNotBlank(query.getContractNumber())) {
qw.like("c.salesContractNumber", query.getContractNumber()); qw.like("c.salesContractNumber", query.getContractNumber());
@ -60,15 +60,7 @@ public class CrudeOilOutboundService extends MybatisBaseService<CrudeOilOutbound
String dfmt = DateUtil.format(curDate, "yyyy-MM-dd"); String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
entity.setDeliveryDate(dfmt); entity.setDeliveryDate(dfmt);
baseMapper.insert(entity); baseMapper.insert(entity);
FlowmeterInformationVo flowmeter=flowmeterInformationMapper.getFlowmeterBySid(dto.getFlowmeterSid()); TankInformation tank=tankInformationMapper.getTankBySid(dto.getTankSid());
TankInformation tank=tankInformationMapper.getTankBySid(flowmeter.getTankSid());
//第一次入库/出库的时候用初始库存减去要出入的数量 给总库存
// if(tank.getLockVersion().equals(0)){
// tank.setInventory(tank.getInitialInventory()-dto.getWeight());
// tank.setLockVersion(tank.getLockVersion()+1);
// }else{
// tank.setInventory(tank.getInventory()-dto.getWeight());
// }
tank.setInventory(tank.getInventory()-dto.getWeight()); tank.setInventory(tank.getInventory()-dto.getWeight());
tankInformationMapper.updateById(tank); tankInformationMapper.updateById(tank);
return rb.success().setMsg("新增成功"); return rb.success().setMsg("新增成功");

11
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.java

@ -19,7 +19,16 @@ import java.util.List;
@Mapper @Mapper
public interface TankInformationMapper extends BaseMapper<TankInformation> { public interface TankInformationMapper extends BaseMapper<TankInformation> {
IPage<TankInformationVo> selectPageVo(IPage<TankInformation> page, @Param(Constants.WRAPPER) Wrapper<TankInformation> qw); IPage<TankInformationVo> selectPageVo(IPage<TankInformation> page, @Param(Constants.WRAPPER) Wrapper<TankInformation> qw);
@Select("select t.*,c.name as crudeName,c.number as crudeNumber from tank_information t left join crude_oil_type_information c on c.sid=t.crudeSid ") @Select("SELECT\n" +
"\tt.*,\n" +
"\tc.NAME AS crudeName,\n" +
"\tc.number AS crudeNumber,\n" +
"\tf.name as flowmeterName,\n" +
"\tf.number as flowmeterNumber\n" +
"FROM\n" +
"\ttank_information t\n" +
"\tLEFT JOIN crude_oil_type_information c ON c.sid = t.crudeSid\n" +
"\tleft join flowmeter_information f on f.sid =t.flowmeterSid ")
List<TankInformationVo> tankList(); List<TankInformationVo> tankList();
@Select("select * from tank_information where sid=#{sid}") @Select("select * from tank_information where sid=#{sid}")
TankInformation getTankBySid(@Param("sid")String sid); TankInformation getTankBySid(@Param("sid")String sid);

5
yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationMapper.xml

@ -5,10 +5,13 @@
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.tankinformation.TankInformationVo"> <select id="selectPageVo" resultType="com.yxt.supervise.cyf.api.tankinformation.TankInformationVo">
SELECT SELECT
*,c.name as crudeName,c.number as crudeNumber *,c.name as crudeName,c.number as crudeNumber,
f.name as flowmeterName,
f.number as flowmeterNumber
FROM FROM
tank_information t tank_information t
left join crude_oil_type_information c on c.sid=t.crudeSid left join crude_oil_type_information c on c.sid=t.crudeSid
left join flowmeter_information f on f.sid =t.flowmeterSid
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.3.173:7101" VUE_APP_URL = "http://192.168.1.193:7101"
##VUE_APP_URL = "http://8.130.39.13:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/flowInstrumentAdd.vue

@ -28,12 +28,12 @@
<span class="item_text">流量仪器Code</span> <span class="item_text">流量仪器Code</span>
<el-input v-model="formobj.code" placeholder="" class="item_input" clearable /> <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
</div> </div>
<div class="item"> <!-- <div class="item">
<span class="item_text">油罐编号</span> <span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank"> <el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" /> <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
</div> </div> -->
</el-card> </el-card>
</div> </div>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/flowInstrument/index.vue

@ -37,8 +37,8 @@
<el-table-column label="流量仪器名称" prop="name" align="center" /> <el-table-column label="流量仪器名称" prop="name" align="center" />
<el-table-column label="流量仪器编码" prop="number" align="center" /> <el-table-column label="流量仪器编码" prop="number" align="center" />
<el-table-column label="流量仪器Code" prop="code" align="center" /> <el-table-column label="流量仪器Code" prop="code" align="center" />
<el-table-column label="油罐编号" prop="tankNumber" align="center" /> <!-- <el-table-column label="油罐编号" prop="tankNumber" align="center" />
<el-table-column label="原油编码" prop="crudeNumber" align="center" /> <el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">

79
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/oilTank/oilTankAdd.vue

@ -22,17 +22,24 @@
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">原油类型</span> <span class="item_text">原油类型</span>
<el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input" <el-select v-model="formobj.crudeName" filterable placeholder="请选择原油类型" class="item_input" @change="getType">
@change="getType">
<el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" /> <el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> --> <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">原油编号</span> <span class="item_text">原油编号</span>
<el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable /> <el-input v-model="formobj.crudeNumber" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> --> <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div> </div>
<div class="item">
<span class="item_text">流量仪器</span>
<el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input"
@change="getFlowmeter">
<el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div>
<div class="item"> <div class="item">
<span class="item_text">油罐容量</span> <span class="item_text">油罐容量</span>
<el-input v-model="formobj.capacity" placeholder="" class="item_input" clearable /> <el-input v-model="formobj.capacity" placeholder="" class="item_input" clearable />
@ -41,6 +48,18 @@
<span class="item_text">油罐库存</span> <span class="item_text">油罐库存</span>
<el-input v-model="formobj.initialInventory" placeholder="" class="item_input" clearable /> <el-input v-model="formobj.initialInventory" placeholder="" class="item_input" clearable />
</div> </div>
<div class="item">
<span class="item_text">油罐底面积</span>
<el-input v-model="formobj.bottomArea" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">原油密度</span>
<el-input v-model="formobj.density" placeholder="" class="item_input" clearable />
</div>
<div class="item">
<span class="item_text">油罐高度</span>
<el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
</div>
</el-card> </el-card>
</div> </div>
@ -50,35 +69,44 @@
<script> <script>
import req from '@/api/oilTank/oilTank' import req from '@/api/oilTank/oilTank'
import req2 from '@/api/flowInstrument/flowInstrument'
export default { export default {
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
crudeLists:[], crudeLists: [],
crudeList:[], crudeList: [],
flowmeterLists: [],
flowmeterList: [],
formobj: { formobj: {
sid: "", sid: "",
number: "", number: "",
crudeSid: "", crudeSid: "",
crudeName: "", crudeName: "",
crudeNumber: "", crudeNumber: "",
flowmeterSid: "",
flowmeterName: "",
capacity: "", capacity: "",
tankPipeline: "", tankPipeline: "",
initialInventory: "", initialInventory: "",
bottomArea: "",
density: "",
height: "",
} }
} }
}, },
created() { created() {
this.crudeinfoList() this.crudeinfoList()
this.getFlowmeterList()
}, },
methods: { methods: {
crudeinfoList() { crudeinfoList() {
req.crudeinfoList().then((res) => { req.crudeinfoList().then((res) => {
if (res.success) { if (res.success) {
console.log(">>>>>>>>>2222222", res.data) console.log(">>>>>>>>>2222222", res.data)
this.crudeLists = res.data this.crudeLists = res.data
for (var i = 0; i <this.crudeLists.length; i++) { for (var i = 0; i < this.crudeLists.length; i++) {
let item = { let item = {
name: this.crudeLists[i].name, name: this.crudeLists[i].name,
@ -91,6 +119,25 @@
} }
}) })
}, },
getFlowmeterList() {
console.log(">>>>>>>>>111111111111wwwwwwwwww")
req2.flowmeterList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.flowmeterLists = res.data
for (var i = 0; i < this.flowmeterLists.length; i++) {
let item = {
name: this.flowmeterLists[i].number,
sid: this.flowmeterLists[i].sid,
}
this.flowmeterList.push(item)
}
}
})
},
saveOrUpdate() { saveOrUpdate() {
req.addInfo(this.formobj) req.addInfo(this.formobj)
.then(resp => { .then(resp => {
@ -113,12 +160,17 @@
this.formobj = { this.formobj = {
sid: "", sid: "",
number: "", number: "",
crudeSid:"", crudeSid: "",
crudeName: "", crudeName: "",
crudeNumber: "", crudeNumber: "",
flowmeterSid: "",
flowmeterName: "",
capacity: "", capacity: "",
tankPipeline: "", tankPipeline: "",
initialInventory: "", initialInventory: "",
bottomArea: "",
density: "",
height: "",
} }
this.$emit('doback') this.$emit('doback')
@ -126,11 +178,18 @@
getType(value) { getType(value) {
console.log(">>>>>>>>>getType", value) console.log(">>>>>>>>>getType", value)
const choose = this.crudeLists.filter((item) => item.sid === value) const choose = this.crudeLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0]) console.log(">>>>>>>>>getType", choose[0])
// this.formobj.crudeSid = choose[0].sid // this.formobj.crudeSid = choose[0].sid
this.formobj.crudeNumber = choose[0].number this.formobj.crudeNumber = choose[0].number
this.formobj.crudeSid = value this.formobj.crudeSid = value
}, },
getFlowmeter(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.flowmeterLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.flowmeterSid = choose[0].sid
this.formobj.flowmeterName = choose[0].number
},
} }
} }
</script> </script>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/flowInstrumentAdd.vue

@ -28,12 +28,12 @@
<span class="item_text">流量仪器Code</span> <span class="item_text">流量仪器Code</span>
<el-input v-model="formobj.code" placeholder="" class="item_input" clearable /> <el-input v-model="formobj.code" placeholder="" class="item_input" clearable />
</div> </div>
<div class="item"> <!-- <div class="item">
<span class="item_text">油罐编号</span> <span class="item_text">油罐编号</span>
<el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank"> <el-select v-model="formobj.tankNumber" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
<el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" /> <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
</div> </div> -->
</el-card> </el-card>
</div> </div>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/flowInstrument/index.vue

@ -37,8 +37,8 @@
<el-table-column label="流量仪器名称" prop="name" align="center" /> <el-table-column label="流量仪器名称" prop="name" align="center" />
<el-table-column label="流量仪器编码" prop="number" align="center" /> <el-table-column label="流量仪器编码" prop="number" align="center" />
<el-table-column label="流量仪器Code" prop="code" align="center" /> <el-table-column label="流量仪器Code" prop="code" align="center" />
<el-table-column label="油罐编号" prop="tankNumber" align="center" /> <!-- <el-table-column label="油罐编号" prop="tankNumber" align="center" /> -->
<el-table-column label="原油编码" prop="crudeNumber" align="center" /> <!-- <el-table-column label="原油编码" prop="crudeNumber" align="center" /> -->
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">

82
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeOutBound/index.vue

@ -31,21 +31,20 @@
value-format="yyyy-MM-dd" placeholder="请选择" /> value-format="yyyy-MM-dd" placeholder="请选择" />
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">流量仪器</span> <span class="item_text">油罐编号</span>
<el-select v-model="formobj.flowmeterName" filterable placeholder="请选择流量仪器" class="item_input" <el-select v-model="formobj.tankName" filterable placeholder="请选择油罐编号" class="item_input" @change="getTank">
@change="getFlowmeter"> <el-option v-for="item in tankList" :key="item.sid" :label="item.name" :value="item.sid" />
<el-option v-for="item in flowmeterList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
<!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> --> <!-- <el-input v-model="formobj.number" placeholder="" class="item_input" clearable /> -->
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">编号</span> <span class="item_text">油编号</span>
<el-input v-model="formobj.tankName" placeholder="" :readonly="true" class="item_input" clearable /> <el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> --> <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">原油编号</span> <span class="item_text">流量仪器</span>
<el-input v-model="formobj.oilType" placeholder="" :readonly="true" class="item_input" clearable /> <el-input v-model="formobj.flowmeterName" placeholder="" :readonly="true" class="item_input" clearable />
<!-- <span class="item_input">{{formobj.crudeNumber}}</span> --> <!-- <span class="item_input">{{formobj.crudeNumber}}</span> -->
</div> </div>
<div class="item"> <div class="item">
@ -69,21 +68,20 @@
<script> <script>
import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound' import req from '@/api/oilTypeInAndOutBound/oilTypeInAndOutBound'
import req2 from '@/api/flowInstrument/flowInstrument'
export default { export default {
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
flowmeterLists: [], tankLists: [],
flowmeterList: [], tankList: [],
formobj: { formobj: {
sid: "", sid: "",
salesContractNumber: "", salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
deliveryDate: "", deliveryDate: "",
flowmeterSid: "", tankSid: "",
flowmeterName: "",
tankName: "", tankName: "",
flowmeterName: "",
oilType: "", oilType: "",
weight: "", weight: "",
value: "", value: "",
@ -94,23 +92,22 @@
}, },
created() { created() {
console.log(">>>>>>>>>created") console.log(">>>>>>>>>created")
this.getFlowmeterList() this.getTankList()
}, },
methods: { methods: {
getFlowmeterList() { getTankList() {
console.log(">>>>>>>>>111111111111wwwwwwwwww") req.tankList().then((res) => {
req2.flowmeterList().then((res) => {
if (res.success) { if (res.success) {
console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data) console.log(">>>>>>>>>111111111111wwwwwwwwww", res.data)
this.flowmeterLists = res.data this.tankLists = res.data
for (var i = 0; i < this.flowmeterLists.length; i++) { for (var i = 0; i < this.tankLists.length; i++) {
let item = { let item = {
name: this.flowmeterLists[i].number, name: this.tankLists[i].number,
sid: this.flowmeterLists[i].sid, sid: this.tankLists[i].sid,
} }
this.flowmeterList.push(item) this.tankList.push(item)
} }
} }
@ -125,20 +122,20 @@
type: 'success', type: 'success',
message: resp.msg message: resp.msg
}) })
this.formobj = { this.formobj = {
sid: "", sid: "",
salesContractNumber: "", salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
deliveryDate: "", deliveryDate: "",
flowmeterSid: "", tankSid: "",
flowmeterName: "", tankName: "",
tankName: "", flowmeterName: "",
oilType: "", oilType: "",
weight: "", weight: "",
value: "", value: "",
remarks: "", remarks: "",
} }
} else { } else {
// resp.code // resp.code
} }
@ -146,17 +143,18 @@
.catch(() => {}) .catch(() => {})
}, },
handleReturn() { handleReturn() {
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
getFlowmeter(value) { getTank(value) {
console.log(">>>>>>>>>getType", value) console.log(">>>>>>>>>getType", value)
const choose = this.flowmeterLists.filter((item) => item.sid === value) const choose = this.tankLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0]) console.log(">>>>>>>>>getType", choose[0])
this.formobj.flowmeterSid = choose[0].sid this.formobj.tankSid = choose[0].sid
this.formobj.tankName = choose[0].tankNumber this.formobj.oilType = choose[0].crudeName
this.formobj.oilType = choose[0].crudeNumber this.formobj.flowmeterName = choose[0].flowmeterName
}, },
} }
} }

8
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/recordOilTank/index.vue

@ -23,8 +23,8 @@
</el-select> </el-select>
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">油罐库存</span> <span class="item_text">油罐库存高度</span>
<el-input v-model="formobj.existingInventory" placeholder="" class="item_input" clearable /> <el-input v-model="formobj.height" placeholder="" class="item_input" clearable />
</div> </div>
</el-card> </el-card>
@ -45,7 +45,7 @@
formobj: { formobj: {
tankName: "", tankName: "",
tankSid: "", tankSid: "",
existingInventory: "" height: ""
} }
} }
}, },
@ -84,7 +84,7 @@
this.formobj = { this.formobj = {
tankName: "", tankName: "",
tankSid: "", tankSid: "",
existingInventory: "", height: "",
} }
} else { } else {

Loading…
Cancel
Save