build

src/views/purchaseIn/purchaseDiffOrder/columns.js

@@ -41,8 +41,8 @@ export default [
     label: '订单来源'
   },
   {
-    prop: 'is_stock',
-    _slot_: 'is_stock',
+    prop: 'order_type',
+    _slot_: 'order_type',
     label: '商品类型'
   },
   {

src/views/purchaseIn/purchaseDiffOrder/index.vue

@@ -111,7 +111,7 @@
                 <el-col :span="4" style="width: 130px; margin-right:10px">
                     <el-select
                       :size="searchSize"
-                      v-model="parmValue.is_stock"
+                      v-model="parmValue.order_type"
                       filterable
                       clearable
                       placeholder="商品类型"
@@ -122,7 +122,11 @@
                         searchList();
                       "
                   >
-                   <el-option v />
+                   <el-option v-for="item in cg_order_type_options"
+                     :key="'order_type' + item.id"
+                     :label="item.label"
+                     :value="item.id" 
+                    />
                   </el-select>
                 </el-col>
 
@@ -141,8 +145,6 @@
              </el-col>
               </el-row>
 
-
-
             <el-row style="padding: 10px 0 0 0;margin-left:-80px">
               <el-col :span="6" style="width: 400px; padding: 0 0 0 0px">
                 <el-input
@@ -199,16 +201,17 @@
             "
           ></el-tag>
         </template>
-        <template #is_stock="{ scope }">
-          <el-tag
-            :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
-            v-text="
-              (is_stock_options.find((item) => item.id == String(scope.row.is_stock)) || {})
-                .name || '--'
-            "
-          ></el-tag>
-        </template>
+
+        <template #order_type="{ scope }">
+                <el-tag
+                  :size="tablebtnSize"
+                  v-text="
+                    (cg_order_type_options.find((item) => item.id == String(scope.row.order_type)) || {})
+                      .label || '--'
+                  "
+                ></el-tag>
+          </template>
+
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((i) => i == '007')"
@@ -279,16 +282,12 @@ export default {
         { id: "1", label: "待业务部门审核" },
         { id: "2", label: "工差单审核完成" },
       ],
-      is_stock_options: [
-        { id: '0', name: '非库存品' },
-        { id: '1', name: '库存品' }
-      ],
       loading: true,
       showModel: false,
       isDetail: false,
       modelId: 0,
       parmValue: {
-        is_stock: '',
+        order_type: '',
         order_source: '',
         name: "", // 业务员名字
         username: "", // 账号

src/views/purchaseIn/purchaseReturn/columns.js

@@ -44,8 +44,8 @@ export default [
     width: '150'
   },
   {
-    prop: 'is_stock',
-    _slot_: 'is_stock',
+    prop: 'order_type',
+    _slot_: 'order_type',
     label: '商品类型',
     width: '150'
   },

src/views/purchaseIn/purchaseReturn/index.vue

@@ -116,7 +116,7 @@
               <el-col :span="4" style="width: 130px;margin-left:10px">
                 <el-select
                   :size="searchSize"
-                  v-model="parmValue.is_stock"
+                  v-model="parmValue.order_type"
                   filterable
                   clearable
                   placeholder="商品类型"
@@ -127,8 +127,11 @@
                     searchList();
                   "
                 >
-                  <el-option value="0" label="非库存品" />
-                  <el-option value="1" label="库存品" />
+                  <el-option v-for="item in cg_order_type_options"
+                     :key="'order_type' + item.id"
+                     :label="item.label"
+                     :value="item.id" 
+                    />
                 </el-select>
               </el-col>
               
@@ -179,13 +182,13 @@
           </div>
         </template>
        
-        <template #is_stock="{ scope }">
+        <template #order_type="{ scope }">
           <el-tag
             size="mini"
             v-text="
               (
-               is_stock_options.find(
-                  (item) => item.id == scope.row.is_stock
+               cg_order_type_options.find(
+                  (item) => item.id == scope.row.order_type
                 ) || {}
               ).label || '--'
             "
@@ -303,10 +306,6 @@ export default {
         // { id: "4", label: "待通知财务" },
         // { id: "5", label: "完成退货" },
       ],
-      is_stock_options:[
-       { id: "0", label: "非库存品" },
-       { id: "1", label: "库存品" },
-      ],
       cg_order_type_options,
       cg_order_source_options,
       loading: true,
@@ -315,7 +314,7 @@ export default {
       modelId: 0,
       parmValue: {
         order_source: "",
-        is_stock: "",
+        order_type: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
         good_type_code: "", //商品属性编号