Explorar o código

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh22

chenrui hai 1 ano
pai
achega
be93650024

+ 5 - 5
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -55,7 +55,7 @@
             <template slot="header">
               <div style="display: flex;">
                 选择产品<span class="sub-title">①输入查询条件--->②查找到需要采购的产品--->③录入采购数量--->④点击“添加”</span>
-                <p class="tag-txt">注意:{{!isDealerUp?'仅限采购【箭冠】产品。':''}}自建产品的采购入库请使用“散件入库”功能</p>
+                <p class="tag-txt">注意:{{ !isDealerUp?'仅限采购【箭冠】产品。':'' }}自建产品的采购入库请使用“散件入库”功能</p>
               </div>
             </template>
             <!-- 选择产品 -->
@@ -205,7 +205,7 @@
                   </a-col>
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
-                      <a-button type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
+                      <a-button v-if="!isDealerUp" type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
                       <a-button id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                   </a-col>
@@ -379,10 +379,10 @@ export default {
       ]
       // 产品来源
       if (this.isDealerUp) {
-        arr.splice(1,0,{ title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true })
+        arr.splice(1, 0, { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true })
         arr.splice(6, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
-      }else{
-        arr.splice(1,0,{ title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true })
+      } else {
+        arr.splice(1, 0, { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true })
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(this.isDealerUp ? 7 : 6, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -24,7 +24,7 @@
               <a-menu-item key="3" v-if="$hasPermissions('M_shoppingCart')">
                 <a-icon type="shopping" /> 购物车
               </a-menu-item>
-              <a-menu-item key="2">
+              <a-menu-item key="2" v-if="!isDealerUp">
                 <a-icon type="funnel-plot" />上次缺货
               </a-menu-item>
               <a-menu-item key="1">