Merge remote-tracking branch 'origin/develop' into develop

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -8,7 +8,7 @@
       <el-radio-button label="工程押金信息" />
       <el-radio-button label="工程订单信息" />
       <el-radio-button label="工程发货信息" />
-      <el-radio-button label="直调发货" />
+      <!-- <el-radio-button label="直调发货" /> -->
        <el-radio-button label="历史记录" />
     </el-radio-group>
     <br><br>

src/views/deposit_home/components/deposit_list-detail.vue

@@ -8,7 +8,7 @@
       <el-radio-button label="工程押金信息" />
       <el-radio-button label="工程订单信息" />
       <el-radio-button label="工程发货信息" />
-      <el-radio-button label="直调发货" />
+      <!-- <el-radio-button label="直调发货" /> -->
          <el-radio-button label="历史记录" />
     </el-radio-group>
     <br><br>

src/views/supply/apply/components/apply_form.vue

@@ -97,7 +97,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
@@ -192,7 +192,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -245,7 +245,7 @@ export default {
       // typeList: [],
       stockList: [],
       categoryList: [],
-      
+
       tableGoodsList: [],
     }
   },
@@ -329,7 +329,7 @@ export default {
         this.categoryList = res.data.records;
       })
     },
-    
+
     // 库存字段
     stockFilter(item, type) {
       let STOCK_ORDER_INVOICE = this.stockList.find(o => o.dictCode == 'STOCK_ORDER_INVOICE').dictValue;
@@ -337,7 +337,16 @@ export default {
         return item.stockAdequate > STOCK_ORDER_INVOICE ? '充足' : item.stockAdequate;
       }
       if(type === 2) {
-        return item.stockCorrespond > STOCK_ORDER_INVOICE ? '充足' : item.stockCorrespond;
+        if ( item.stockCorrespond <= 0 ) {
+          return '无货'
+        }else if(item.stockCorrespond >= 1 &&  item.stockCorrespond <= 30){
+          return item.stockCorrespond
+        }else if(item.stockCorrespond >=31 && item.stockCorrespond <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
+        // return item.stockCorrespond > STOCK_ORDER_INVOICE ? '充足' : item.stockCorrespond;
       }
     },
 
@@ -521,4 +530,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/apply/components/engin_form.vue

@@ -503,7 +503,16 @@ export default {
         return item.stockAdequate > STOCK_ORDER_INVOICE ? '充足' : item.stockAdequate;
       }
       if(type === 2) {
-        return item.stockCorrespond > STOCK_ORDER_INVOICE ? '充足' : item.stockCorrespond;
+          if ( item.stockCorrespond <= 0 ) {
+          return '无货'
+        }else if(item.stockCorrespond >= 1 &&  item.stockCorrespond <= 30){
+          return item.stockCorrespond
+        }else if(item.stockCorrespond >=31 && item.stockCorrespond <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
+        // return item.stockCorrespond > STOCK_ORDER_INVOICE ? '充足' : item.stockCorrespond;
       }
     },
 

src/views/supply/displace/components/displace_form.vue

@@ -816,8 +816,15 @@ export default {
     },
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
-      else if (item.status2 >= item.qty) return '可用';
-      else return '短缺';
+     if ( item.status2 <= 0 ) {
+          return '无货'
+        }else if(item.status2 >= 1 &&  item.status2 <= 30){
+          return '紧缺'
+        }else if(item.status2 >=31 && item.status2 <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
     },
     // 获取商品列表
     getGoodsList() {

src/views/supply/engin/components/commerce_form.vue

@@ -815,8 +815,15 @@ export default {
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
       else if (item.status2 <= 0) return '无货';
-      else if (item.status2 >= item.qty) return '可用';
-      else return '短缺';
+     if ( item.status2 <= 0 ) {
+          return '无货'
+        }else if(item.status2 >= 1 &&  item.status2 <= 30){
+          return '紧缺'
+        }else if(item.status2 >=31 && item.status2 <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
     },
 
     handleSelectionChange(val) {

src/views/supply/engin/components/home_form.vue

@@ -1104,8 +1104,15 @@ export default {
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
       else if (item.status2 <= 0) return '无货';
-      else if (item.status2 >= item.qty) return '可用';
-      else return '短缺';
+     if ( item.status2 <= 0 ) {
+          return '无货'
+        }else if(item.status2 >= 1 &&  item.status2 <= 30){
+          return '紧缺'
+        }else if(item.status2 >=31 && item.status2 <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
     },
 
     // 保存 / 提交审核

src/views/supply/policy/components/retail_form.vue

@@ -1807,8 +1807,20 @@ export default {
         item.status2 === '' ||
         item.status2 === null ||
         item.status2 === undefined
-      ) { return '未检查' } else if (item.status2 >= item.qty) return '可用'
-      else return '短缺'
+      )  return '未检查' ;
+
+     if ( item.status2 <= 0 ) {
+          return '无货'
+        }else if(item.status2 >= 1 &&  item.status2 <= 30){
+          return '紧缺'
+        }else if(item.status2 >=31 && item.status2 <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
+
+    //  else if (item.status2 >= item.qty) return '可用'
+    //   else return '短缺'
     },
     // 保存
     clickSubmitForm() {

src/views/supply/retail/components/retail_form.vue

@@ -716,6 +716,7 @@ export default {
         materialId: ids.join(',')
       }).then(res => {
         if(res.data) {
+
           this.goodsList.forEach((item, index) => {
             item.status1 = res.data[index].allStockNum;
             item.status2 = res.data[index].stockNum;
@@ -726,9 +727,20 @@ export default {
 
     status2Filter(item) {
       if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
-      else if (item.status2 <= 0) return '无货';
-      else if (item.status2 >= item.qty) return '可用';
-      else return '短缺';
+
+        if ( item.status2 <= 0 ) {
+          return '无货'
+        }else if(item.status2 >= 1 &&  item.status2 <= 30){
+          return '紧缺'
+        }else if(item.status2 >=31 && item.status2 <= 1000 ){
+          return '有货'
+        }else{
+          return '充足'
+        }
+
+      // else if (item.status2 <= 0) return '无货';
+      // else if (item.status2 >= item.qty) return '可用';
+      // else return '短缺';
     },
 
     // 保存