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

src/api/yongyou/yongyou.js

@@ -40,7 +40,7 @@ export function getSpareStorePageYY (parameter) {
  */
 export function getSpareStorePageYY3 (parameter) {
   return axios({
-    url: '/yongyou/spareStore/page/test?' + stringify(parameter),
+    url: '/yongyou/spareStore/page?' + stringify(parameter),
     method: 'get',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8'

src/views/purchase/inventory-list/InventoryList.vue

@@ -59,7 +59,7 @@
           showPagination="auto"
         >
           <template #action="record">
-            <a @click="handleView(record)">查看</a>
+<!--            <a @click="handleView(record)">查看</a>-->
             <operation-button
               v-if="record.status===1||record.status===3"
               @click="handlePush(record)"
@@ -71,7 +71,6 @@
         </s-table>
       </a-col>
     </a-row>
-    <detail ref="detailModal"/>
     <AddSpareForm ref="addSpareForm" @ok="handleOk" />
   </a-card>
 </template>
@@ -79,17 +78,12 @@
 <script>
 import { STable, Ellipsis } from '@/components'
 import AddSpareForm from './modules/AddSpareForm'
-import Detail from './modules/Detail'
-import { fetchSpareTypeTree } from '@/api/sqarepartmanage/sparetype'
-import { fetchStoreTree } from '@/api/store/store'
-
 import { getSpareAddPage, pushSpareStore } from '@/api/yongyou/yongyou'
 export default {
   name: 'SpareStoreSelectModalYY',
   components: {
     STable,
     Ellipsis,
-    Detail,
     AddSpareForm
   },
   data () {
@@ -130,6 +124,21 @@ export default {
           width: '100px',
           dataIndex: 'ggxh'
         },
+        {
+          title: '存货分类',
+          checked: true,
+          width: '100px',
+          dataIndex: 'codeName'
+        },
+        {
+          title: '厂区',
+          checked: true,
+          width: '100px',
+          dataIndex: 'tokenType',
+          customRender: (text) => {
+            return this.flagMap[text]
+          }
+        },
         {
           title: '计量单位',
           checked: true,
@@ -140,7 +149,7 @@ export default {
           }
         },
         {
-          title: '成本默认计量单位编码',
+          title: '单位编码',
           checked: true,
           width: '100px',
           dataIndex: 'caComUnitCode',
@@ -225,7 +234,8 @@ export default {
       optionAlertShow: false,
       isCreated: false,
       statusMap: {},
-      unitMap: {}
+      unitMap: {},
+      flagMap: {},
     }
   },
   created () {
@@ -234,7 +244,7 @@ export default {
     this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_ADD_UNIT)
     this.policyMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CSR_POLICY)
     this.planMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PLAN_METHOD)
-    // this.tableOption()
+    this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PROJECT_NEW_AND_OLD)
   },
   methods: {
     tableOption () {

src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -485,10 +485,9 @@ export default {
       this.chartLine.render()
     },
     toCalendar () {
-      getCalendarNotice().then(res => {
+      /* getCalendarNotice().then(res => {
         const router = this.$router
         if (res.data.calendar_date !== null) {
-          // this.modalVisible = true
           this.$confirm({
             title: '提示',
             content: '七天内需要完成的任务!',
@@ -508,7 +507,7 @@ export default {
             onCancel () {}
           })
         }
-      })
+      }) */
     }
   }
 }

src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -489,30 +489,29 @@ export default {
       this.chartLine.render()
     },
     toCalendar () {
-      getCalendarNotice().then(res => {
-        const router = this.$router
-        if (res.data.calendar_date !== null) {
-          // this.modalVisible = true
-          this.$confirm({
-            title: '提示',
-            content: '七天内需要完成的任务!',
-            okText: '去查看',
-            icon: 'info-circle',
-            onOk () {
-              return new Promise((resolve, reject) => {
-                router.push({ path: '/repaire/calendar' })
-                resolve()
-              }).catch(err => {
-                this.$message.error({
-                  title: '错误',
-                  description: err.message
-                })
-              })
-            },
-            onCancel () {}
-          })
-        }
-      })
+      // getCalendarNotice().then(res => {
+      //   const router = this.$router
+      //   if (res.data.calendar_date !== null) {
+      //     this.$confirm({
+      //       title: '提示',
+      //       content: '七天内需要完成的任务!',
+      //       okText: '去查看',
+      //       icon: 'info-circle',
+      //       onOk () {
+      //         return new Promise((resolve, reject) => {
+      //           router.push({ path: '/repaire/calendar' })
+      //           resolve()
+      //         }).catch(err => {
+      //           this.$message.error({
+      //             title: '错误',
+      //             description: err.message
+      //           })
+      //         })
+      //       },
+      //       onCancel () {}
+      //     })
+      //   }
+      // })
     }
     /* getLineCharts (id, data) {
       this.chartLine = new Chart({

src/views/workplace/backlog/SbWorkplaceBacklog.vue

@@ -443,10 +443,9 @@ export default {
       this.chartLine.render()
     },
     toCalendar () {
-      getCalendarNotice().then(res => {
+      /* getCalendarNotice().then(res => {
         const router = this.$router
         if (res.data.calendar_date !== null) {
-          // this.modalVisible = true
           this.$confirm({
             title: '提示',
             content: '七天内需要完成的任务!',
@@ -466,7 +465,7 @@ export default {
             onCancel () {}
           })
         }
-      })
+      }) */
     }
   }
 }

src/views/workplace/backlog/StoreWorkplaceBacklog.vue

@@ -546,10 +546,9 @@ export default {
       modal.base()
     },
     toCalendar () {
-      getCalendarNotice().then(res => {
+      /* getCalendarNotice().then(res => {
         const router = this.$router
         if (res.data.calendar_date !== null) {
-          // this.modalVisible = true
           this.$confirm({
             title: '提示',
             content: '七天内需要完成的任务!',
@@ -569,7 +568,7 @@ export default {
             onCancel () {}
           })
         }
-      })
+      }) */
     }
   }
 }

src/views/workplace/backlog/WorkplaceBacklog.vue

@@ -449,10 +449,9 @@ export default {
       this.$refs.table.refresh()
     },
     toCalendar () {
-      getCalendarNotice().then(res => {
+      /* getCalendarNotice().then(res => {
         const router = this.$router
         if (res.data.calendar_date !== null) {
-          // this.modalVisible = true
           this.$confirm({
             title: '提示',
             content: '七天内需要完成的任务!',
@@ -472,7 +471,7 @@ export default {
             onCancel () {}
           })
         }
-      })
+      }) */
     }
   }
 }