电量管理增加角色degree-manage

src/views/produce/data/modules/BaseForm.vue

@@ -85,6 +85,21 @@
               v-decorator="['sort', {rules: [{required: true, message: '排序不能为空'}]}]"/>
           </a-form-item>
         </row-item>
+        <row-item>
+
+          <a-form-item
+            label="是否需要手工填写"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select
+              v-decorator="['flag', {rules: [{required: true, message: '不能为空'}]}]"
+              placeholder="请选择">
+              <a-select-option v-for="(label, value) in flagMap" :key="value" :label="label" :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
       </row-list>
     </a-form>
   </a-card>
@@ -107,6 +122,7 @@ export default {
   props: {},
   created () {
     // 下拉框map
+    this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
   },
   methods: {
     base (record) {
@@ -123,6 +139,7 @@ export default {
         setFieldsValue(Object.assign(pick(record, [
           'id',
           'no',
+          'flag',
           'name',
           'unit',
           'lineOne',

src/views/produce/data/modules/Detail.vue

@@ -13,6 +13,7 @@
       <detail-list-item term="单位">{{ model.unit }}</detail-list-item>
       <detail-list-item term="分组1">{{ model.lineOne }}</detail-list-item>
       <detail-list-item term="分租2">{{ model.lineTwo }}</detail-list-item>
+      <detail-list-item term="是否需要手工填报">{{ model.flag==0?'否':'是' }}</detail-list-item>
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
       <detail-list-item term="创建人ID">{{ model.createdUserId }}</detail-list-item>
       <detail-list-item term="更新时间">{{ model.updateTime }}</detail-list-item>
@@ -42,6 +43,7 @@ export default {
       model: {
         'no': null,
         'name': null,
+        'flag': null,
         'unit': null,
         'lineOne': null,
         'lineTwo': null,

src/views/produce/report/modules/BaseForm.vue

@@ -183,6 +183,7 @@
               v-decorator="['value', {rules: [{required: true, message: '值不能为空'}]}]" />
           </a-form-item>
         </row-item>
+
       </row-list>
     </a-form>
   </a-card>
@@ -199,6 +200,7 @@ export default {
     return {
       confirmLoading: false,
       modalTitle: null,
+      statusMap: {},
       form: this.$form.createForm(this),
       dataList: [],
       visible: false

src/views/produce/report/modules/Detail.vue

@@ -19,6 +19,7 @@
       <detail-list-item term="分组1">{{ model.lineOne }}</detail-list-item>
       <detail-list-item term="分组2">{{ model.lineTwo }}</detail-list-item>
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
+      <detail-list-item term="是否需要手工填报">{{ model.flag==0?'否':'是' }}</detail-list-item>
       <detail-list-item term="值">{{ model.value }}</detail-list-item>
       <detail-list-item term="创建人ID">{{ model.createdUserId }}</detail-list-item>
       <detail-list-item term="更新时间">{{ model.updateTime }}</detail-list-item>
@@ -49,6 +50,7 @@ export default {
       model: {
         'dataId': null,
         'no': null,
+        'flag': null,
         'name': null,
         'date': null,
         'day': null,

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -20,7 +20,7 @@
           <img src="@/assets/red2.png" alt="" width="100%" height="17px">
         </div>
       </a-col>
-<!--      <a-col :span="6">
+      <!--      <a-col :span="6">
         <div class="target" @click="$router.push('/preparation/mine?status='+ JSON.stringify([18]))">
           <div class="target-title">
             被拒工单 <a-icon type="caret-left" />
@@ -529,11 +529,11 @@ export default {
               content: () => {
                 return (<div>
               近一周工单任务如下: <br />
-                  {
-                    res.data.map(item => {
-                      return <div>{item.calendarDate + ' : ' + item.num }</div>
-                    })
-                  }
+                {
+                  res.data.map(item => {
+                    return <div>{item.calendarDate + ' : ' + item.num }</div>
+                  })
+                }
                 </div>)
               },
               okText: '去查看',