1

src/views/purchase/orderRecord/components/addView.vue

@@ -211,13 +211,15 @@
                 max-height="320"
                 style="width: 100%"
               >
-                <el-table-column label="采购单信息" align="center">
-                  <el-table-column
+                    <el-table-column
                     prop="cgdNO"
                     label="采购单编号"
-                    width="120"
+                    width="135"
+                     fixed="left"
                     show-overflow-tooltip
                   />
+                <el-table-column label="采购单信息" align="center">
+            
                   <el-table-column
                     prop="purchasePrice"
                     label="货款"
@@ -231,14 +233,36 @@
                   <el-table-column
                     prop="contector"
                     label="联系人"
+                    width="65"
                     show-overflow-tooltip
                   />
                   <el-table-column
                     prop="ownerName"
                     label="采购员"
                     show-overflow-tooltip
-                    align="center"
+                    width="65"
                   />
+                  <el-table-column label="发货状态" width="85">
+                    <template slot-scope="scope">
+                      <el-tag
+                        size="mini"
+                        :type="
+                          scope.row.send_info == '3'
+                            ? 'success'
+                            : scope.row.send_info == '2'
+                            ? 'warning'
+                            : 'danger'
+                        "
+                        v-text="
+                          (
+                            send_status_list.find(
+                              (item) => item.value == scope.row.send_info
+                            ) || {}
+                          ).label || '--'
+                        "
+                      ></el-tag>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                     prop="inv_company"
                     label="开票编号"
@@ -273,6 +297,7 @@
                     prop="goodUnit"
                     label="单位"
                     show-overflow-tooltip
+                    width="50"
                   />
                   <el-table-column
                     prop="isDiff"
@@ -404,12 +429,14 @@
                   prop="taxPoint"
                   label="原税率"
                   fixed="right"
+                  width="60"
                   show-overflow-tooltip
                 />
                 <el-table-column
                   prop="taxPoint1"
                   label="新税率"
                   fixed="right"
+                    width="60"
                   show-overflow-tooltip
                 />
                 <el-table-column
@@ -499,6 +526,20 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      send_status_list: [
+        {
+          value: "1",
+          label: "未发货",
+        },
+        {
+          value: "2",
+          label: "部分发货",
+        },
+        {
+          value: "3",
+          label: "全部发货",
+        },
+      ],
       pdisabled: false,
       companyNoCode: "",
       companyNoName: "",
@@ -693,9 +734,7 @@ export default {
         addList = JSON.parse(JSON.stringify(e)),
         newList = [].concat(...oldList);
       addList.forEach((v1, index) => {
-        let oldindex = oldList.findIndex(
-          (v2) => v1.cgdNO === v2.cgdNO
-        );
+        let oldindex = oldList.findIndex((v2) => v1.cgdNO === v2.cgdNO);
         if (oldindex === -1) {
           newList.push(addList[index]);
         }

src/views/purchase/orderRecord/components/orderChange.vue

@@ -15,11 +15,30 @@
     @close="closeModel"
   >
     <el-card style="margin-top: -15px">
-      <el-row >
+      <el-row>
         <el-col :span="24" style="padding-bottom: 10px">
+          <el-select
+            v-model="parmValue.send_status"
+            clearable
+            :size="searchSize"
+            placeholder="发货状态"
+            style="width: 120px"
+            @change="
+              parmValue.page = 1;
+              searchList();
+            "
+          >
+            <el-option
+              v-for="item in send_status_list"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
           <el-input
             placeholder="采购单编号"
-            style="width: 300px"
+            style="width: 300px; margin-left: 10px"
             v-model="parmValue.sequenceNo"
           >
             <el-button
@@ -28,6 +47,7 @@
               @click.native="(parmValue.page = 1), searchList()"
             ></el-button>
           </el-input>
+
           <el-button
             class="fr"
             type="warning"
@@ -64,14 +84,14 @@
                 prop="cgdNO"
                 label="采购单编号"
                 show-overflow-tooltip
-                width="120px"
+                width="135px"
               />
               <el-table-column
                 prop="purchasePrice"
                 label="货款"
                 show-overflow-tooltip
               />
-                 <el-table-column
+              <el-table-column
                 prop="inv_company_name"
                 label="回票公司"
                 show-overflow-tooltip
@@ -85,13 +105,39 @@
               <el-table-column
                 prop="contector"
                 label="联系人"
+                width="65"
                 show-overflow-tooltip
               />
               <el-table-column
                 prop="ownerName"
                 label="采购员"
+                width="65"
                 show-overflow-tooltip
               />
+
+              <el-table-column label="发货状态" width="85">
+                <template slot-scope="scope">
+                  <el-tag
+                    size="mini"
+                    :type="
+                      scope.row.send_info == '3'
+                        ? 'success'
+                        : scope.row.send_info == '2'
+                        ? 'warning'
+                        : 'danger'
+                    "
+                    v-text="
+                      (
+                        send_status_list.find(
+                          (item) => item.value == scope.row.send_info
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                  <!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+        <el-button type="text" size="small">编辑</el-button> -->
+                </template>
+              </el-table-column>
             </el-table-column>
             <el-table-column label="商品基础信息" align="center">
               <el-table-column
@@ -110,11 +156,6 @@
                 label="单位"
                 show-overflow-tooltip
               />
-              <el-table-column
-                prop="price"
-                label="单价"
-                show-overflow-tooltip
-              />
               <el-table-column
                 prop="orderNum"
                 label="数量"
@@ -311,6 +352,20 @@ export default {
       title: "选择采购单商品",
       loading: false,
       count: 0,
+      send_status_list: [
+        {
+          value: "1",
+          label: "未发货",
+        },
+        {
+          value: "2",
+          label: "部分发货",
+        },
+        {
+          value: "3",
+          label: "全部发货",
+        },
+      ],
       parmValue: {
         name: "", // 账户
         code: "", // code
@@ -369,7 +424,6 @@ export default {
       this.multipleSelection = val;
     },
     async initForm() {
-      console.log(8888888888888888888888);
       await this.searchList();
     },
     async submitForm() {
@@ -476,7 +530,6 @@ export default {
 .orderRecord {
   .setWidth {
     width: 100% !important;
-    
   }
 }
 </style>