Merge remote-tracking branch 'origin/demo_' into demo_

src/views/repair/application-form/modules/BaseForm.vue

@@ -16,7 +16,7 @@
       </a-form-item>
 
       <row-list :col="2">
-        <row-item>
+        <!-- <row-item>
           <a-form-item
             label="录入方式"
             :labelCol="BaseTool.Constant.labelCol"
@@ -31,7 +31,7 @@
               </a-radio-button>
             </a-radio-group>
           </a-form-item>
-        </row-item>
+        </row-item> -->
         <row-item v-if="inputType===2">
           <a-form-item
             label="设备名称"

src/views/sb/scraps/modules/DetailAudit.vue

@@ -46,6 +46,7 @@
     <detail-list v-show="storeInfo" title="" :col="2">
       <detail-list-item term="单号">{{ model.outNo }}</detail-list-item>
       <detail-list-item term="成本归属">{{ model.feeFrom }}</detail-list-item>
+      <detail-list-item term="项目名称">{{ model.projectName }}</detail-list-item>
       <detail-list-item term="仓库名称">{{ model.storeName }}</detail-list-item>
     </detail-list>
     <title-divider v-show="storeInfo" title="备件明细" width="90px"></title-divider>

src/views/store/outstoreform/modules/BaseFormYY.vue

@@ -127,29 +127,29 @@
             </a-select>
           </a-form-item>
         </a-col>
-<!--        <a-tree-select-->
-<!--          style="width: 100%"-->
-<!--          :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"-->
-<!--          :treeData="treeData"-->
-<!--          :treeNodeFilterProp="'title'"-->
-<!--          :showSearch="true"-->
-<!--          v-decorator="['parentId', {rules: [{required: isShowParent, message: '上层设备类型不能为空'}]}]"-->
-<!--          placeholder="请选择"-->
-<!--        >-->
+        <!--        <a-tree-select-->
+        <!--          style="width: 100%"-->
+        <!--          :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"-->
+        <!--          :treeData="treeData"-->
+        <!--          :treeNodeFilterProp="'title'"-->
+        <!--          :showSearch="true"-->
+        <!--          v-decorator="['parentId', {rules: [{required: isShowParent, message: '上层设备类型不能为空'}]}]"-->
+        <!--          placeholder="请选择"-->
+        <!--        >-->
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="项目："
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-          <a-tree-select
-            style="width: 100%"
-            :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-            :treeData="treeData"
-            v-decorator="['projectId', {rules: [{required: true, message: '上层设备类型不能为空'}]}]"
-            placeholder="请选择"
-          >
-        </a-tree-select>
+            <a-tree-select
+              style="width: 100%"
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="treeData"
+              v-decorator="['projectId', {rules: [{required: true, message: '上层设备类型不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
@@ -273,7 +273,7 @@ export default {
       visible: false,
       maskClosable: false,
       outFlag: 1,
-      tokenType:1,
+      tokenType: 1,
       model: {},
       sbPositionList: [],
       feeFromMap: {},
@@ -431,11 +431,8 @@ export default {
       this.data = record.detailList
     },
     setTree (record = {}) {
-      console.log(111)
       fetchSbTypeTree().then((res) => {
-        this.treeData = res.data
-        console.log(this.treeData)
-        this.treeData = res.data.map( item =>{
+        this.treeData = res.data.map(item => {
           item.selectable = item.children == null
           return item
         })
@@ -591,7 +588,7 @@ export default {
       this.data = data.filter(item => record.autoId !== item.autoId)
     },
     handleSpareStoreSelect () {
-      this.$refs.spareStoreSelectModal.base({tokenType:this.tokenType})
+      this.$refs.spareStoreSelectModal.base({ tokenType: this.tokenType })
     },
     handleSpareStoreSelected (record, keys, rows) {
       console.log(rows)