lilei 2 年 前
コミット
c9aa87e480

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1678258500553
+  "version": 1678344712055
 }

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -319,7 +319,7 @@ export default {
       display: inline-block;
       vertical-align: middle;
       color: #333;
-      margin-right: 10px;
+      margin-right: 15px;
     }
     .ant-tag-green,.ant-tag-orange{
       vertical-align: middle;

+ 23 - 9
src/views/salesManagement/salesQueryNew/edit.vue

@@ -3,7 +3,9 @@
       <a-page-header :ghost="false" :backIcon="false" class="header-bar">
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <a class="billno">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+          <a class="billno" style="margin-right:15px;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+          <a-tag color="green" v-if="detailData.billStatusDictValue">{{ detailData.billStatusDictValue }}</a-tag>
+          <a-tag color="orange" v-if="detailData.financialStatusDictValue">{{ detailData.financialStatusDictValue }}</a-tag>
           <!-- <span style="margin-left:10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span> -->
           <a-button
             id="salesEdit-edit-btn"
@@ -50,7 +52,7 @@
                   <a-icon type="close-square"/>清空列表
                 </a-menu-item>
                 <a-menu-item key="1">
-                  <a-icon type="rest" style="font-size: 14px;" />删除急件
+                  <a-icon type="rest" style="font-size: 14px;" />{{isOwerEdit?'删除急件':'删除缺货'}}
                 </a-menu-item>
               </a-menu>
               <a-button type="link" class="button-default"> <a-icon type="unordered-list" />  更多</a-button>
@@ -75,8 +77,20 @@
                     <a-input v-model.trim="productForm.productName" allowClear placeholder="输入产品名称" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
-                  <a-form-item label="是否有急件">
+                <a-col :md="4" :sm="24" v-if="isOwerEdit">
+                  <a-form-item label="是否为急件">
+                    <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
+                      <a-select-option value="1">
+                        是
+                      </a-select-option>
+                      <a-select-option value="0">
+                        否
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="4" :sm="24" v-else>
+                  <a-form-item label="是否为缺货">
                     <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
                       <a-select-option value="1">
@@ -437,7 +451,7 @@ export default {
         this.delSalerOrder()
       }
       if(e.key == 1){ // 删除急件
-        this.delSalerOrder(1)
+        this.delSalerOrder(this.isOwerEdit?1:2)
       }
     },
     // 打印预览/快捷打印
@@ -617,20 +631,20 @@ export default {
       })
     },
     // 清空已选产品
-    delSalerOrder (oosFlag) {
+    delSalerOrder (flag) {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: oosFlag==1?'确认要删除所有急件吗?删除后不可恢复。':'确认要清空已选产品列表吗?',
+        content: !flag?'确认要清空已选产品列表吗?':(flag==1 ?'确认要删除所有急件吗?删除后不可恢复。':'确认要删除所有缺货吗?删除后不可恢复。'),
         centered: true,
         closable: true,
         onOk () {
           _this.spinning = true
-          let params = { id: _this.orderId, oosFlag: oosFlag==1 ? 1 : undefined }
+          let params = { id: _this.orderId, oosFlag: flag==1 ? 1 : undefined, oosFlag: flag==2 ? 1 : undefined }
           salesDel(params).then(res => {
             if (res.status == 200) {
               _this.getOrderDetail(true)
-              if(!oosFlag){
+              if(!flag){
                 _this.dataSource = []
               }
               _this.$message.success(res.message)