浏览代码

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

lilei 4 年之前
父节点
当前提交
03a5f7a48f

+ 2 - 2
src/views/financialManagement/warehousingAudit/detail.vue

@@ -25,8 +25,8 @@
             <a-descriptions-item label="采购总款数">{{ (basicInfoData&&basicInfoData.totalCategory!=0) ? basicInfoData.totalCategory : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总数量">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总成本">¥{{ (basicInfoData&&basicInfoData.totalAmount!=0) ? basicInfoData.totalAmount : 0 }}</a-descriptions-item>
-            <a-descriptions-item label="入库总款数">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
-            <a-descriptions-item label="入库总数量">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
+            <a-descriptions-item label="入库总款数">{{ (basicInfoData&&basicInfoData.totalPutCategory!=0) ? basicInfoData.totalPutCategory : 0 }}</a-descriptions-item>
+            <a-descriptions-item label="入库总数量">{{ (basicInfoData&&basicInfoData.totalPutQty!=0) ? basicInfoData.totalPutQty : 0 }}</a-descriptions-item>
             <a-descriptions-item label="入库总成本">¥{{ (basicInfoData&&basicInfoData.totalPutAmount!=0) ? basicInfoData.totalPutAmount : 0 }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>

+ 1 - 1
src/views/productManagement/priceChangeRecord/list.vue

@@ -249,7 +249,7 @@ export default {
               ]
             })
           }
-          if (res.data.isShowSpecialPrice && res.data.isShowSpecialPrice == '0') { //  是否展示特约价
+          if (res.data.isShowSpecialPrice && res.data.isShowSpecialPrice == '1') { //  是否展示特约价
             this.columns.push({
               title: '特约价',
               dataIndex: 'gterminaldsdPrice',

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -12,7 +12,7 @@
       <!-- 总计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
         <div slot="message" >
-          <div>产品款数 <strong>{{ item.totalCategory }}</strong> ,采购数量合计 <strong>{{ item.totalQty }}</strong> ,采购金额合计¥<strong>{{ item.totalAmount }}</strong></div>
+          <div>产品款数 <strong>{{ item.totalPutCategory }}</strong> ,采购数量合计 <strong>{{ item.totalPutQty }}</strong> ,采购金额合计¥<strong>{{ item.totalPutAmount }}</strong></div>
         </div>
       </a-alert>
       <!-- 列表 -->

+ 3 - 3
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -85,17 +85,17 @@
           size="small"
           type="link"
           class="button-info"
-          v-if="record.state == 'WAIT_SUBMIT'"
+          v-if="record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT'"
           @click="handleEdit(record)"
           id="purchaseReturnList-edit-btn">编辑</a-button>
         <a-button
           size="small"
           type="link"
           class="button-error"
-          v-if="record.state == 'WAIT_SUBMIT'"
+          v-if="record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT'"
           @click="handleDel(record)"
           id="purchaseReturnList-del-btn">删除</a-button>
-        <span v-if="record.state != 'WAIT_SUBMIT'">--</span>
+        <span v-if="!(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT')">--</span>
       </template>
     </s-table>
   </a-card>