lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
706ff64293

+ 2 - 2
src/views/productManagement/shelfNoManage/changeRecordModal.vue

@@ -58,8 +58,8 @@ export default {
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '变更时间', dataIndex: 'updateDate', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '变更人', dataIndex: 'creatorName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '20%', align: 'left', customRender: function (text) { return text || '--' } }
+        { title: '货位编号-变更前', dataIndex: 'oldStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位编号-变更后', dataIndex: 'newStackPlaceCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 0
src/views/productManagement/shelfNoManage/editHwModal.vue

@@ -20,6 +20,7 @@
         <a-form-model-item label="产品名称">{{ nowData&&nowData.productVO.name || '--' }}</a-form-model-item>
         <a-form-model-item label="货位编号" prop="stackPlaceCode">
           <a-input v-model="form.stackPlaceCode" :maxlength="10" placeholder="请输入货位编号(最多10个字符)"></a-input>
+          <div style="color:#fba200;font-size:12px;">货位编号允许为空,为空则表示此产品没有货位编号</div>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">

+ 13 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -86,7 +86,7 @@
                 <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? detailData.totalCityAmount : '--' }}</strong>;</span>
               </div>
               <div>
-                <a-button v-if="detailData && (detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'HQ_CHANGE')" type="link" @click="showStockOut=true">缺货明细</a-button>
+                <a-button v-if="detailData && (detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'HQ_CHANGE')" type="link" @click="openStockOut">缺货明细</a-button>
                 <a-checkbox v-model="isCityPrice" v-if="$hasPermissions('B_isShowPrice')"><span style="display: inline-block;margin-top: 1px;">市级价</span></a-checkbox>
               </div>
             </div>
@@ -332,6 +332,18 @@ export default {
       const row = this.detailData
       this.$router.push({ name: 'salesEdit', params: { sn: row.salesBillSn } })
     },
+    // 打开缺货明细
+    openStockOut () {
+      if (this.outStockStr != '') {
+        this.showStockOut = true
+      } else {
+        this.$info({
+          title: '提示',
+          content: '此销售单暂无缺货产品!',
+          centered: true
+        })
+      }
+    },
     //  详情
     getDetail () {
       salesDetailBySn({ salesBillSn: this.$route.params.sn || this.bizSn }).then(res => {

+ 2 - 2
src/views/salesManagement/salesQuery/printModal.vue

@@ -47,8 +47,8 @@
           </a-radio-group>
           <!-- 销售导出 -->
           <a-radio-group v-model="form.priceType" v-if="nowType=='export'">
-            <a-radio value="SALES_BILL_COST_NOT_LACK">导出</a-radio>
-            <a-radio value="SALES_BILL_NOT_LACK">不导出</a-radio>
+            <a-radio :value="form.dataScope == 'ENOUGH' ? 'SALES_BILL_COST_NOT_LACK':'SALES_BILL_COST'">导出</a-radio>
+            <a-radio :value="form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>

+ 3 - 0
src/views/salesManagement/salesQuery/stockOutDetailModal.vue

@@ -27,6 +27,9 @@
         :defaultLoadData="false"
         bordered>
       </s-table>
+      <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
+        <a-button @click="isShow=false">关闭</a-button>
+      </div>
     </a-spin>
   </a-modal>
 </template>