xiongchao há 3 anos atrás
pai
commit
e4a362056e

+ 15 - 5
public/hitch-screen/index.html

@@ -9,6 +9,7 @@
   <link rel="stylesheet" href="static/index.css" media="all"/>
 </head>
 <body>
+  <div class="title-name">设备运行状态一览图</div>
   <div id="echart" class="echart"></div>
   <div class="data">
     <div>
@@ -20,9 +21,9 @@
     </div>
     <div>
       <div id="weekJob" class="item title">
-        <span>设备名称</span>
+        <span>设备编号</span>
         <span>保养任务</span>
-        <span>报修时间</span>
+        <span>保养计划时间</span>
       </div>
 <!--      <div class="item">
         <span>设备名称</span>
@@ -32,7 +33,16 @@
     </div>
   </div>
 </body>
-
+<style>
+  .title-name{
+    position: absolute;
+    top: 50px;
+    left: 40%;
+    font-size: 34px;
+    color: black;
+    z-index: 10000;
+  }
+</style>
 <script>
   const ACCESS_TOKEN = 'Access-Token'
   const VUE_STORE_BASE = 'pro__'
@@ -211,12 +221,12 @@ function getSbDetail(sbNo){
         let weekJob = '';
         for(var i=0;i<response.data.weekList.length;i++){
            weekJob = weekJob + '  <div class=\'item\'>\n' +
-                  '          <span>'+ response.data.weekList[i].sbName + '</span>\n' +
+                  '          <span>'+ response.data.weekList[i].sbNo + '</span>\n' +
                   '          <span>'+ response.data.weekList[i].name.substring(0, 6) + '</span>\n' +
                   '          <span>'+ response.data.weekList[i].startTime + '</span>\n' +
                   '        </div>'
         }
-        console.log('weekJob: ' + weekJob);
+        // console.log('weekJob: ' + weekJob);
         $('#weekJob').siblings().remove();
         $('#weekJob').after(weekJob);
       },

BIN
public/hitch-screen/static/right-bak.png


BIN
public/hitch-screen/static/right.png


+ 13 - 0
src/views/repair/fee/RepairFee.vue

@@ -79,6 +79,7 @@ export default {
       // 查询参数
       queryParam: {
       },
+      moneyTypeMap: {},
       // 表头
       columns: [
         {
@@ -102,6 +103,17 @@ export default {
             return this.BaseTool.Amount.formatter(text)
           }
         },
+        {
+          title: '费用日期',
+          dataIndex: 'feeDate'
+        },
+        {
+          title: '货币单位',
+          dataIndex: 'moneyType',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.moneyTypeMap, text)
+          }
+        },
         {
           title: '费用类别',
           dataIndex: 'type',
@@ -166,6 +178,7 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
+    this.moneyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.MONEY_TYPE)
     this.tableOption()
   },
   methods: {

+ 40 - 4
src/views/repair/fee/modules/BaseForm.vue

@@ -19,16 +19,15 @@
         v-show="false"
       >
         <a-input
-          v-decorator="['repairId', {rules: [{required: true, message: '维修单id不能为空'}]}]" />
+          v-decorator="['repairId']" />
       </a-form-item>
       <a-form-item
-        label="维修单号"
+        label="委外单号"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
         <a-input
-          disabled
-          v-decorator="['repairNo', {rules: [{required: true, message: '维修单号不能为空'}]}]" />
+          v-decorator="['repairNo', {rules: [{required: true, message: '委外单号不能为空'}]}]" />
       </a-form-item>
       <a-form-item
         label="费用金额"
@@ -43,6 +42,20 @@
           :parser="BaseTool.Amount.parser"
           v-decorator="['fee', {rules: [{required: true, message: '费用金额不能为空'}]}]" />
       </a-form-item>
+      <a-form-item
+        label="货币单位"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-select v-decorator="['moneyType', {rules: [{required: true, message: '货币单位不能为空'}]}]" placeholder="请选择">
+          <a-select-option
+            v-for="(label,value) in moneyTypeMap"
+            :key="value"
+            :label="label"
+            :value="value">{{ label }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item
         label="费用类别"
         :labelCol="BaseTool.Constant.labelCol"
@@ -57,6 +70,16 @@
           </a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item
+        label="费用日期"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-date-picker
+          style="width: 100%"
+          :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+          v-decorator="['feeDate']" />
+      </a-form-item>
       <a-form-item
         label="费用原因"
         :labelCol="BaseTool.Constant.labelCol"
@@ -135,6 +158,7 @@ export default {
       modalTitle: null,
       defaultImageList: [],
       imageList: [],
+      moneyTypeMap: {},
       defaultFileList: [],
       fileList: [],
       uploadUrl: uploadUrl,
@@ -152,6 +176,7 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
+    this.moneyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.MONEY_TYPE)
   },
   methods: {
     base (record, repairForm = {}) {
@@ -177,6 +202,14 @@ export default {
       this.defaultImageList = this.BaseTool.UPLOAD.transImg(this.imageList)
       this.defaultFileList = this.BaseTool.UPLOAD.transImg(this.fileList)
       this.modalTitle = '编辑'
+      if (record.feeDate != null) {
+        record.feeDate = this.BaseTool.Moment(record.feeDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        this.$nextTick(() => {
+          setFieldsValue(Object.assign(pick(record, [
+            'feeDate'
+          ])))
+        })
+      }
       // 日期处理
       this.$nextTick(() => {
         setFieldsValue(Object.assign(pick(record, [
@@ -184,6 +217,7 @@ export default {
           'repairId',
           'repairNo',
           'fee',
+          'moneyType',
           'type',
           'reason',
           'descripition',
@@ -199,6 +233,8 @@ export default {
           this.confirmLoading = false
           return
         }
+        values.feeDate = this.BaseTool.Date.formatter(values.feeDate, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+
         // 上传文件
         values.imageList = this.imageList
         values.fileList = this.fileList

+ 6 - 0
src/views/repair/fee/modules/Detail.vue

@@ -9,6 +9,8 @@
     <detail-list title="" :col="2">
       <detail-list-item term="维修单号">{{ model.repairNo }}</detail-list-item>
       <detail-list-item term="费用金额">{{ BaseTool.Amount.formatter(model.fee) }}</detail-list-item>
+      <detail-list-item term="费用日期">{{ model.feeDate }}</detail-list-item>
+      <detail-list-item term="货币类别">{{ BaseTool.Object.getField(moneyTypeMap,model.moneyType) }}</detail-list-item>
       <detail-list-item term="费用类别">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="费用原因">{{ model.reason }}</detail-list-item>
       <detail-list-item term="费用描述">{{ model.descripition }}</detail-list-item>
@@ -52,12 +54,15 @@ export default {
       mdl: {},
       modalTitle: null,
       visible: false,
+      moneyTypeMap: {},
       // 下拉框map
       typeMap: {},
       model: {
         'repairId': null,
         'fee': null,
         'type': null,
+        'moneyType': null,
+        'feeDate': null,
         'reason': null,
         'descripition': null,
         'remark': null,
@@ -72,6 +77,7 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
+    this.moneyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.MONEY_TYPE)
   },
   methods: {
     base (record) {

+ 13 - 0
src/views/repair/fee/modules/RepairFeeTable.vue

@@ -95,6 +95,7 @@ export default {
       // 查询参数
       queryParam: {
       },
+      moneyTypeMap: {},
       // 表头
       columns: [
         {
@@ -118,6 +119,17 @@ export default {
             return this.BaseTool.Amount.formatter(text)
           }
         },
+        {
+          title: '费用日期',
+          dataIndex: 'feeDate'
+        },
+        {
+          title: '货币单位',
+          dataIndex: 'moneyType',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.moneyTypeMap, text)
+          }
+        },
         {
           title: '费用类别',
           dataIndex: 'type',
@@ -189,6 +201,7 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
+    this.moneyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.MONEY_TYPE)
     this.tableOption()
   },
   methods: {