Finish Hotfix-zh-159

src/layout/components/Sidebar/SidebarItem.vue

@@ -90,6 +90,7 @@ export default {
       return false
     },
     resolvePath(routePath) {
+
       if (isExternal(routePath)) {
         return routePath
       }

src/layout/components/Sidebar/index.vue

@@ -37,15 +37,16 @@ export default {
       return this.$router.options.routes.concat(global.antRouter) //把路由concat进去
     },
     activeMenu() {
+      console.log(444);
       const route = this.$route
-      console.log(route);
+
       const { meta, path ,fullUrl} = route
-      console.log(fullUrl,'kllk',this.routes);
+          console.log(route);
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
         return meta.activeMenu
       }
-      return fullUrl
+      return path
     },
     showLogo() {
       return this.$store.state.settings.sidebarLogo

src/layout/components/TagsView/index.vue

@@ -69,6 +69,7 @@ export default {
   },
   methods: {
     isActive(route) {
+
       return route.path === this.$route.path
     },
     isAffix(tag) {
@@ -158,6 +159,7 @@ export default {
       })
     },
     toLastView(visitedViews, view) {
+      console.log(1111);
       const latestView = visitedViews.slice(-1)[0]
       if (latestView) {
         this.$router.push(latestView.fullPath)

src/views/supply/apply/engin_list.vue

@@ -172,7 +172,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
-                        <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip></el-table-column>
 
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>

src/views/supply/implement/nsales_list.vue

@@ -39,8 +39,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入产品编码"></el-input>
+              <el-form-item label="物料编码" prop="chNum">
+                <el-input v-model="screenForm.chNum" placeholder="请输入物料编码"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">

src/views/supply/policy/policy_list.vue

@@ -309,6 +309,13 @@
               min-width="100"
               show-overflow-tooltip
             />
+              <el-table-column
+              align="left"
+              label="文件编号"
+              prop="fileNo"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="left"
               label="是否直调"

src/views/supply/retail/retail_list.vue

@@ -64,6 +64,7 @@
                 <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
+
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
                 <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
@@ -185,7 +186,14 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+           <el-table-column
+              align="left"
+              label="文件编号"
+              prop="fileNo"
+              min-width="100"
+              show-overflow-tooltip
+            />
+           <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isDirectTransfer ? '是':'否'}}
               </template>

src/views/supply/sales/components/sales_detail.vue

@@ -75,7 +75,7 @@
 
                   </template>
                  <template>
-                  {{refundableQty}}
+                  {{scope.row.refundableQty}}
                  </template>
             </template>
 
@@ -122,7 +122,7 @@
       </div>
     </div>
 
-    <div style="margin:10px">
+    <div style="margin:10px" v-if="edit">
     <el-button type="primary" @click="updateNum">保存</el-button>
 </div>
   </div>

src/views/supply/sales/sales_list.vue

@@ -65,10 +65,10 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="chNum">
+              <el-form-item label="物料编码" prop="chNum">
                 <el-input
                   v-model="screenForm.chNum"
-                  placeholder="请输入产品编码"
+                  placeholder="请输入物料编码"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -365,7 +365,7 @@
                 <el-button type="text" @click="toDetail(scope.row)"
                   >详情</el-button
                 >
-                <el-button type="text" v-if="scope.row.type==2 && scope.row.examineStatus!=OK"
+                <el-button type="text" v-if="scope.row.type ===2 &&  scope.row.examineStatus!=='OK'"
                 @click="toDetail(scope.row),edit = true"
                   >编辑</el-button
                 >
@@ -508,6 +508,7 @@ cid:'',
       isShowReturnForm: false,
       value1: "",
       qty:'',
+      edit:false,
       choiceDate: "",
       multipleSelection: [],
       isShowExamineDialog: false,