Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/purchasingManagement/purchaseOrderList.vue

@@ -217,8 +217,12 @@
               </span>
             </template>
             <div>
-              <span style="margin-left: 6px" v-if="scope.row.packingType != '散装'">
-              {{ scope.row.baggingNotes }}</span>
+              <span
+                style="margin-left: 6px"
+                v-if="scope.row.packingType != '散装'"
+              >
+                {{ scope.row.baggingNotes }}</span
+              >
             </div>
           </el-popover>
         </template>
@@ -261,13 +265,24 @@
         label="入库结算"
         prop="updateDate"
         width="130"
-      ><span v-if="scope.row.procurementPlanType != '现货'">--</span></el-table-column>
+      >
+        <template slot-scope="scope"
+          ><span v-if="scope.row.procurementPlanType != '现货'"
+            >--</span
+          ></template
+        ></el-table-column
+      >
       <el-table-column
         class="table_td"
         label="平仓结算"
         prop="updateDate"
         width="130"
-      ><span v-if="scope.row.procurementPlanType != '现货'">--</span></el-table-column>
+        ><template slot-scope="scope"
+          ><span v-if="scope.row.procurementPlanType != '现货'"
+            >--</span
+          ></template
+        ></el-table-column
+      >
       <el-table-column prop="seller" label="操作" width="310">
         <template slot-scope="scope">
           <!-- <div v-if="scope.row.procurementPlanType != '现货'"> -->