优化

src/views/repair/application-form/RepairApplicationForm.vue

@@ -241,7 +241,7 @@ export default {
           width: '100px',
           dataIndex: 'receiveOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text) {
               return '是'
             } else {
               return '否'
@@ -254,7 +254,7 @@ export default {
           width: '100px',
           dataIndex: 'repairOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text) {
               return '是'
             } else {
               return '否'

src/views/repair/application-form/RepairCheckForm.vue

@@ -219,7 +219,7 @@ export default {
           width: '100px',
           dataIndex: 'receiveOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text) {
               return '是'
             } else {
               return '否'
@@ -232,7 +232,7 @@ export default {
           width: '100px',
           dataIndex: 'repairOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text === true) {
               return '是'
             } else {
               return '否'

src/views/repair/application-form/RepairForm.vue

@@ -252,7 +252,7 @@ export default {
           width: '100px',
           dataIndex: 'receiveOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text) {
               return '是'
             } else {
               return '否'
@@ -265,7 +265,7 @@ export default {
           width: '100px',
           dataIndex: 'repairOvertime',
           customRender: (text, record, index) => {
-            if (text === '1') {
+            if (text) {
               return '是'
             } else {
               return '否'

src/views/sb/info/modules/BaseForm.vue

@@ -260,13 +260,18 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="存放位置"
+            label="所属车间"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
-              style="width: 100%"
-              v-decorator="['positionId']" />
+            <a-select v-decorator="['positionId', { rules: [{required: true, message: '所属车间不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="({id,name}) in sbPositionData"
+                :key="id"
+                :label="name"
+                :value="id">{{ name }}
+              </a-select-option>
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
@@ -908,6 +913,7 @@
 import pick from 'lodash.pick'
 import { addSbInfo, updateSbInfo, fetchSbInfo, copySbInfo } from '@/api/sb/info'
 import { fetchSbTypeTree } from '@/api/sb/type'
+import { querySbPosition } from '@/api/sb/position'
 import FirmProducerSelectModal from '@/views/firm/producer/modules/FirmProducerSelectModal'
 import SbGuigeSelectModal from '@/views/sb/guige/modules/SbGuigeSelectModal'
 import SbModelSelectModal from '@/views/sb/model/modules/SbModelSelectModal'
@@ -947,6 +953,7 @@ export default {
       groupList: {},
       visible: false,
       sbTypeTreeData: [],
+      sbPositionData: [],
       // sbInfoTreeData: [],
       // sourceSbInfoTreeData: [],
       // sbPositionTreeData: [],
@@ -1247,6 +1254,9 @@ export default {
       fetchSbTypeTree().then(res => {
         this.sbTypeTreeData = res.data
       })
+      querySbPosition().then(res => {
+        this.sbPositionData = res.data
+      })
       // getSbInfoTree({ id: record.id }).then(res => {
       //  this.sbInfoTreeData = res.data
       //  this.sourceSbInfoTreeData = res.data

src/views/sb/info/modules/Detail.vue

@@ -46,6 +46,8 @@
         <detail-list-item term="生产商">{{ model.producerName }}</detail-list-item>
         <detail-list-item term="大小尺寸">{{ model.zz }}</detail-list-item>
         <detail-list-item term="系列号(出厂编号)">{{ model.zzh }}</detail-list-item>
+        <detail-list-item term="使用位置">{{ model.cph }}</detail-list-item>
+        <detail-list-item term="所属车间">{{ model.positionName }}</detail-list-item>
         <detail-list-item term="使用寿命">{{ model.workYear }}</detail-list-item>
         <detail-list-item term="是否显示">{{ model.isShow?'显示':'不显示' }}</detail-list-item>
         <detail-list-item v-show="model.isChild == 1" term="是否子设备">子设备</detail-list-item>
@@ -294,12 +296,13 @@ export default {
         'fdjxh': null,
         'fdjh': null,
         'cph': null,
+        'positionId': null,
+        'positionName': null,
         'dph': null,
         'zz': null,
         'rlType': null,
         'color': null,
         'seatNumber': null,
-
         'registerNo': null,
         'characterType': null,
         'usedNo': null,

src/views/sb/position/SbPosition.vue

@@ -35,7 +35,7 @@
     <div class="table-operator">
       <a-button v-if="$auth('sb-positions-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
       <a-button style="margin-left: 8px" v-if="$auth('sb-positions-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-      <!--<a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-positions-del')">
+      <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-positions-del')">
         <a-menu slot="overlay">
           <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
             <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
@@ -44,7 +44,7 @@
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
         </a-button>
-      </a-dropdown>-->
+      </a-dropdown>
     </div>
 
     <s-table
@@ -165,8 +165,8 @@ export default {
           ...parameter,
           ...this.queryParam,
           dataScope: {
-            sortBy: 'desc',
-            sortName: 'update_time'
+            sortBy: 'asc',
+            sortName: 'sort'
           }
         }
         return getSbPositionPage(Object.assign(parameter, this.queryParam))

src/views/sb/position/modules/BaseForm.vue

@@ -18,8 +18,7 @@
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
         <a-input
-          disabled
-          v-decorator="['no', {rules: [{required: false, message: '编码不能为空'}]}]" />
+          v-decorator="['no', {rules: [{required: true, message: '编码不能为空'}]}]" />
       </a-form-item>
       <a-form-item
         label="名称"

src/views/sb/position/modules/Detail.vue

@@ -7,6 +7,7 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
+      <detail-list-item term="编号">{{ model.id }}</detail-list-item>
       <detail-list-item term="编码">{{ model.no }}</detail-list-item>
       <detail-list-item term="名称">{{ model.name }}</detail-list-item>
       <detail-list-item term="类型">{{ BaseTool.Object.getField(positionTypeMap,model.type) }}</detail-list-item>
@@ -41,6 +42,7 @@ export default {
       modalTitle: null,
       visible: false,
       model: {
+        'id': null,
         'no': null,
         'name': null,
         'type': null,