youhua

src/components/WorkTree/WorkTree.vue

@@ -76,7 +76,7 @@
                   </div>
                   <a class="del-node" @click.stop="close(item)">×</a>
                 </div>
-                <div class="add-btn-box">
+                <div class="add-btn-box" >
                   <button type="button" class="add-bar" @click="add(item)">+</button>
                 </div>
               </div>
@@ -131,7 +131,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
 *,
 :after,
 :before {
@@ -274,6 +274,7 @@ export default {
   right: 50%;
   width: 1px;
   height: 100%;
+  max-height: 0px;
   background-color: #ccd4e0;
 }
 .add-btn-box {
@@ -434,6 +435,7 @@ export default {
   top: 0;
   width: 1px;
   height: 100%;
+  max-height: 250px;
   background-color: #dfdfe8;
 }
 .condition-node-box .del-btn {

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

@@ -35,12 +35,12 @@
               <a-badge :count="numCheckjob3" title="润滑任务" :number-style="{ backgroundColor: '#52c41a' }">
                 <a-button style="margin-left: 20px" type="default" @click="handleViewCheckJob3(3)">润滑任务</a-button>
               </a-badge>
-              <a-button style="margin-left: 20px" type="default" @click="handleViewTree()">设备树</a-button>
-              <a-button v-show="model.useType==4" style="margin-left: 8px" type="default" @click="handleMeasure()">检定记录</a-button>
+              <a-button v-show="model.useType==4" style="margin-left: 20px" type="default" @click="handleMeasure()">检定记录</a-button>
+              <!-- <a-button style="margin-left: 20px" type="default" @click="handleViewTree()">设备树</a-button>
               <a-button style="margin-left: 20px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
               <a-button style="margin-left: 20px" type="default" @click="handleRepairReportSbInfo()">工单分析</a-button>
-              <a-button style="margin-left: 20px" type="default" @click="handleRepairReportSbInfoFee()">费用分析</a-button>
-              <a-button style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button>
+              <a-button style="margin-left: 20px" type="default" @click="handleRepairReportSbInfoFee()">费用分析</a-button> -->
+              <a-button style="margin-left: 20px" type="default" @click="handleEdit()">修改</a-button>
               <a-button style="margin-left: 8px" type="default" :loading="confirmLoading" @click="handleOk()">刷新</a-button>
               <a-button style="margin-left: 20px" type="primary" @click="handleCancel()">返回</a-button>
             </span>
@@ -89,6 +89,24 @@
                 停机记录
               </a-button>
             </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleViewTree()" block>设备树</a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleTuiCalendar(1)" block>
+                保养日历
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRepairReportSbInfo()" block>
+                工单分析
+              </a-button>
+            </a-col>
+            <a-col :span="10">
+              <a-button shape="round" @click="handleRepairReportSbInfoFee()" block>
+                费用分析
+              </a-button>
+            </a-col>
           </a-row>
 
         </a-layout-sider>

src/views/store/transferstoreform/TransferStoreForm.vue

@@ -65,17 +65,17 @@
           <a-popconfirm v-if="record.status==1" title="是否要提交，提交将更新库存？" @confirm="updateStore(record.id)">
             <a>提交</a>
           </a-popconfirm>
-          <a-divider v-if="record.status==1"  type="vertical" />
+          <a-divider v-if="record.status==1" type="vertical" />
           <a-popconfirm v-if="$auth('store-out-store-forms-del')&&record.status==1" title="是否要删除该条数据？" @confirm="batchDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </template>
       </span>
-       <span slot="status" slot-scope="text">
-          <badge
-            :status="DictCache.COLOR.OUT_STORE_FORM_STATUS[text]"
-            :text="statusMap[text]" />
-        </span>
+      <span slot="status" slot-scope="text">
+        <badge
+          :status="DictCache.COLOR.OUT_STORE_FORM_STATUS[text]"
+          :text="statusMap[text]" />
+      </span>
     </s-table>
     <base-form ref="baseModal" @ok="handleOk"/>
     <detail ref="detailModal"/>
@@ -252,9 +252,8 @@ export default {
         res.data.inStoreName = record.inStoreName
         modal.base(res.data)
       })
-
-    } ,
-    updateStore(id){
+    },
+    updateStore (id) {
       updateStore({ id: id }).then(res => {
         this.$message.info('出库成功')
         this.$refs.table.refresh()