戴艳蓉 преди 3 години
родител
ревизия
cb77dfccdc

+ 12 - 8
src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -18,18 +18,20 @@
 
       <el-table-column
         show-overflow-tooltip
-        prop="status"
+        prop="send_status"
         label="状态"
         width="80"
       >
         <template slot-scope="scope">
-          {{ scope.row.status }}
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="scope.row.send_status == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
+              (
+                statusOptions.find(
+                  (item) => item.id == scope.row.send_status
+                ) || {}
+              ).label || '--'
             "
           ></el-tag>
         </template>
@@ -186,9 +188,11 @@ export default {
       outCode: "",
       // 状态
       statusOptions: [
-        { id: "1", label: "已出库" },
-        { id: "2", label: "验收中" },
-        { id: "3", label: "验收完成" },
+               { id: "0", label: "待发货" },
+        { id: "1", label: "待库管发货" },
+        { id: "2", label: "待收货" },
+        { id: "3", label: "已收货" },
+        { id: "4", label: "已全部退货" }
       ],
       showGoodsModel: false,
       stock_code: "",

+ 14 - 19
src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -3,6 +3,7 @@
     v-loading="loading"
     :model="ruleForm"
     :rules="rules"
+    :size="'mini'"
     status-icon
     ref="ruleForm"
     label-width="90px"
@@ -13,13 +14,11 @@
         <el-form-item label="发货总数" prop="send_num" required>
           <el-input
             disabled
-            placeholder="物流单号"
+            placeholder="发货总数"
             v-model="ruleForm.send_num"
             maxlength="100"
           />
         </el-form-item>
-      </el-col>
-      <el-col :span="8">
         <el-form-item label="物流公司" prop="post_name">
           <search-express
             :value="ruleForm.post_name"
@@ -30,15 +29,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
-        <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            placeholder="物流单号"
-            v-model="ruleForm.post_code"
-            maxlength="100"
-          />
-        </el-form-item>
-      </el-col>
+
       <el-col :span="8">
         <el-form-item label="物流费用" prop="post_fee">
           <el-input
@@ -49,13 +40,19 @@
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
+        <el-form-item label="物流单号" prop="post_code">
+          <el-input
+            placeholder="物流单号"
+            v-model="ruleForm.post_code"
+            maxlength="100"
+          />
+        </el-form-item>
       </el-col>
 
-      <el-col
-        :span="16"
-        style="text-align: right"
-      >
-        <el-button type="primary" :size="'mini'"  @click="submitForm">保 存 </el-button>
+      <el-col :span="8" style="text-align: right">
+        <el-button type="primary" :size="'mini'" @click="submitForm"
+          >保 存
+        </el-button>
       </el-col>
     </el-row>
   </el-form>
@@ -135,8 +132,6 @@ export default {
     this.initForm();
   },
   methods: {
-    
-
     async initForm() {
       this.loading = true;
       await this.resetForm();

+ 1 - 2
src/views/sellOut/sellOutOrder/detail.vue

@@ -68,9 +68,8 @@
             <el-collapse-item
               title="库管发货"
               name="3"
-              v-if="status === '0' && powers.some((item) => item == '080')"
+              v-if="status === '1' && powers.some((item) => item == '080')"
             >
-            11
               <want-deliver
                 :newTime="newTime"
                 v-if="newTime !== ''"