暂存

src/components/globalComponents/file-upload-pdf/main.vue

@@ -5,6 +5,7 @@
       :accept="accept"
       :multiple="multiple"
       class="fileUp"
+      :class="{ miniInput: size === 'mini' }"
       type="file"
       name="file"
       :disabled="disabled"
@@ -30,7 +31,10 @@ export default {
       type: Boolean,
       default: false,
     },
-    size: "mini",
+    size: {
+      type: String,
+      default: "mini",
+    },
     disabled: {
       //是否禁用
       type: Boolean,

src/components/search-good-modal/main.vue

@@ -190,7 +190,7 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
-  props: ["showModel", "once"],
+  props: ["showModel", "once", "isonline"],
 
   /**
    * 属性集合
@@ -225,6 +225,7 @@ export default {
         status: "1", //
         company: "",
         supplier: "",
+        isonline: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -289,6 +290,7 @@ export default {
         status: "1", //
         company: "",
         supplier: "",
+        isonline: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -319,6 +321,7 @@ export default {
       this.parmValue.good_name = this.select === "2" ? this.sinput : "";
       this.parmValue.company = this.select === "3" ? this.sinput : "";
       this.parmValue.supplier = this.select === "4" ? this.sinput : "";
+      this.parmValue.isonline = this.isonline || "";
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.cat_id =
         model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";

src/views/sellOut/salesOrder/columns.js

@@ -1,7 +1,8 @@
 export default [
+  { type: "selection", fixed: "left", _noset_: true },
   {
     prop: "orderCode",
-    label: "销售订单编号",
+    label: "订单编号",
     width: "155px",
   },
 
@@ -66,6 +67,12 @@ export default [
     width: "125px",
   },
 
+  {
+    prop: "use_order",
+    label: "订单用途",
+    width: "100px",
+  },
+
   {
     prop: "addtime",
     label: "创建时间",

src/views/sellOut/salesOrder/index.vue

@@ -59,12 +59,15 @@
                 </el-select>
               </el-col>
               <!-- 客户公司 -->
-              <el-col :span="4" style="width: 400px; padding: 0 0 0 10px">
-                <search-customer
-                  :value="customerCode"
-                  :size="searchSize"
-                  :placeholder="'客户公司名称'"
-                  @searchChange="customerChange"
+              <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
+                <search-work-company
+                  :type="'1'"
+                  :value="parmValue.supplierNo"
+                  :size="'mini'"
+                  :placeholder="'销售方公司'"
+                  :disabled="false"
+                  :isDetail="false"
+                  @searchChange="supplierChange"
                 />
               </el-col>
 
@@ -78,17 +81,24 @@
                   刷新
                 </el-button>
               </el-col>
+               <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >
+                  设置订单用途
+                </el-button>
+              </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <el-col :span="6" style="width: 371px; ">
-                <search-work-company
-                  :type="'1'"
-                  :value="parmValue.supplierNo"
-                  :size="'mini'"
-                  :placeholder="'销售方公司'"
-                  :disabled="false"
-                  :isDetail="false"
-                  @searchChange="supplierChange"
+              <el-col :span="6" style="width: 371px">
+                <search-customer
+                  :value="customerCode"
+                  :size="searchSize"
+                  :placeholder="'客户公司名称'"
+                  @searchChange="customerChange"
                 />
               </el-col>
 
@@ -114,7 +124,7 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="6" style="width: 450px; padding: 0 0 0 10px">
+              <el-col :span="6" style="width: 325px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="关键字"
@@ -125,15 +135,12 @@
                 >
                   <el-select
                     v-model="select"
-                    style="width: 137px"
+                    style="width: 100px"
                     slot="prepend"
                     placeholder="请选择"
                     @change="searchList"
                   >
-                    <el-option
-                      label="销售订单编号"
-                      value="orderCode"
-                    ></el-option>
+                    <el-option label="订单编号" value="orderCode"></el-option>
                     <!-- <el-option
                       label="商品属性编号"
                       value="good_code"
@@ -165,7 +172,7 @@
 
               <el-col
                 :span="3"
-                style="width: 66px; float: right"
+                style="width: 56px; float: right"
                 v-if="powers.some((item) => item == '003')"
               >
                 <el-button

src/views/sellOut/stockApply/components/addEdit.vue

@@ -162,6 +162,7 @@
       :once="true"
       :cat_id="cat_id"
       :show-model="showGoodsModel"
+      :isonline="'1'"
       @cancel="showGoodsModel = false"
       @resultList="addGoodsRes"
     />
@@ -470,7 +471,9 @@ export default {
       p {
         // width: calc(100% - 100px);
         width: 100%;
-        padding: 0 15px;
+        padding: 0 10px;
+        height: 38px;
+        line-height: 38px;
         overflow: hidden;
         color: #606266;
         &.no {

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="zixunOrder pagePadding">
-    <!-- <div>{{powers}}---{{is_project}}</div> -->
+    <div>{{ powers }}---{{ is_project }}</div>
     <ex-table
       v-loading="loading"
       :table="table"
@@ -104,7 +104,7 @@
               scope.row.status === '1' ||
               scope.row.status === '2' ||
               scope.row.status === '5') &&
-            status == '3'
+            (status == '3' || status == '2' || status == '7')
           "
           effect="dark"
           content="选择该商品"