暂存

src/apis/service/purchaseIn/wsmInOrder/index.js

@@ -0,0 +1,18 @@
+// 物业管理员
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 添加
+  add: (data, params) => http(api + "add", data, "post", params),
+  // 删除
+  delete: (data, params) => http(api + "delete", data, "post", params),
+  // 分页查询
+  list: (data, params) => http(api + "orderinlist", data, "post", params),
+  // 详情
+  detail: (data, params) => http(api + "detail", data, "post", params),
+  // 更新
+  update: (data, params) => http(api + "update", data, "post", params),
+  // 修改状态
+  status: (data, params) => http(api + "accountstatus", data, "post", params),
+};
+   

src/views/purchaseIn/wsmInOrder/index.vue

@@ -227,7 +227,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import columns from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 

src/views/sellOut/consultSheet/addEdit.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-loading="loading"
-    :title="title"
+    :title="'添加咨询订单'"
     :center="true"
     align="left"
     top="10vh"
@@ -19,82 +19,105 @@
           <el-form
             ref="ruleForm"
             :model="ruleForm"
-            status-icon
-            :rules="rulesThis"
             label-width="110px"
             id="demo-ruleForm"
           >
             <el-row v-if="ruleForm !== null">
-              <el-col v-for="item in columns" :key="item.prop" :span="item.col">
-                <el-form-item :label="item.label + ':'">
-                  <div>{{ ruleForm[item.prop] }}{{ item.unit }}</div>
-                </el-form-item>
-              </el-col>
+              <template v-for="item in columns">
+                <el-col
+                  :key="item.prop"
+                  :span="item.col"
+                  v-if="ruleForm[item.prop]"
+                >
+                  <el-form-item :label="item.label + ':'">
+                    <div>{{ ruleForm[item.prop] }}{{ item.unit }}</div>
+                  </el-form-item>
+                </el-col>
+              </template>
             </el-row>
           </el-form>
-          <!-- <el-form
-            ref="ruleForm"
-            :model="ruleForm"
+        </el-col>
+        <el-col :span="24" style="padding: 20px 0 0 0">
+          <el-form
+            ref="addForm"
+            :model="addForm"
             status-icon
             :rules="rulesThis"
             label-width="110px"
-            class="demo-ruleForm"
+            class="demo-addForm"
           >
-            <el-form-item
-              v-if="id === 'add' || isDetail"
-              label="账号"
-              prop="username"
-            >
-              <el-input v-model="ruleForm.username" :disabled="isDetail" />
-            </el-form-item>
-            <el-form-item label="真实姓名" prop="name">
-              <el-input v-model="ruleForm.name" :disabled="isDetail" />
-            </el-form-item>
-            <el-form-item label="手机号" prop="mobile">
-              <el-input v-model="ruleForm.mobile" :disabled="isDetail" />
-            </el-form-item>
-            <el-form-item label="所在部门" prop="itemid">
-              <all-organize
-                :value="ruleForm.itemid"
-                :is-detail="isDetail"
-                :disabled="isDetail"
-                :multiple="true"
-                :checkStrictly="true"
-                :placeholder="'请选择所在部门'"
-                @searchChange="itemidChange"
-              />
-            </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="ruleForm.email" :disabled="isDetail" />
-            </el-form-item>
-
-            <el-form-item label="角色" prop="role_id">
-              <el-radio-group v-model="ruleForm.role_id" :disabled="isDetail">
-                <el-radio
-                  v-for="item in roleList"
-                  :key="item.id"
-                  :label="item.id"
-                  :disabled="item.status !== '1'"
-                  >{{ item.role_name }}</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-
-            <el-form-item label="状态" prop="status">
-              <el-switch
-                v-model="ruleForm.status"
-                active-value="1"
-                inactive-value="0"
-                :disabled="isDetail"
-              />
-            </el-form-item>
-          </el-form> -->
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="销售方公司" prop="username">
+                  <search-supplier
+                    :value="addForm.username"
+                    :placeholder="'入库公司名称'"
+                    :disabled="false"
+                    :isDetail="false"
+                    @searchChange="supplierChange"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="发货类型" prop="name">
+                  <el-select
+                    v-model="addForm.name"
+                    style="width: 100%"
+                    placeholder="请选择发货类型"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="下单数量" prop="mobile">
+                  <el-input v-model="addForm.mobile" placeholder="下单数量" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="是否特殊商品" prop="status">
+                  <el-select
+                    v-model="addForm.status"
+                    style="width: 100%"
+                    placeholder="请选择是否特殊商品"
+                  >
+                    <el-option
+                      v-for="item in statusOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="下单备注" prop="itemid">
+                  <el-input
+                    v-model="addForm.itemid"
+                    type="textarea"
+                    placeholder="请输入备注"
+                    :rows="3"
+                    maxlength="300"
+                    show-word-limit
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
         </el-col>
+
         <el-col :span="24" style="text-align: right">
-          <el-button v-if="!isDetail" type="primary" @click="submitForm"
+          <el-button type="primary" :size="'mini'"  @click="submitForm"
             >保 存
           </el-button>
-          <el-button @click="showModelThis = false">{{
+          <el-button  :size="'mini'" @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -107,12 +130,6 @@ import asyncRequest from "@/apis/service/sellOut/consultSheet";
 import resToken from "@/mixins/resToken";
 import {
   isnumber,
-  isMobile,
-  validEmail,
-  isAlphanumeric,
-  isChinese,
-  isEmoticon,
-  validAlphabets,
 } from "@/utils/validate";
 import columns from "./columnsForm";
 export default {
@@ -120,62 +137,12 @@ export default {
   props: ["showModel", "id", "isDetail", "sitem"],
   mixins: [resToken],
   data() {
-    const validateusername = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("账号不能为空！"));
-      } else {
-        if (value.length < 6 || value.length > 18) {
-          callback(new Error("账号规则为6~18位数字与字母组合！"));
-        } else {
-          if (isnumber(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else if (validAlphabets(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else if (!isAlphanumeric(value)) {
-            callback(new Error("账号规则为6~18位数字与字母组合！"));
-          } else {
-            callback();
-          }
-        }
-      }
-    };
-    const validatename = (rule, value, callback) => {
+    const validateWeight = (rule, value, callback) => {
       if (value === "") {
-        callback(new Error("真实姓名不能为空！"));
+        callback(new Error("不能为空!"));
       } else {
-        if (value.length < 2 || value.length > 12) {
-          callback(new Error("真实姓名规则为2~12位汉字！"));
-        } else {
-          if (!isChinese(value)) {
-            console.log(9999);
-            callback(new Error("真实姓名规则为2~12位汉字！"));
-          } else if (isEmoticon(value)) {
-            console.log(2345);
-            callback(new Error("真实姓名规则为2~12位汉字！"));
-          } else {
-            callback();
-          }
-        }
-      }
-    };
-    const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
-      } else {
-        if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
-
-    const validateEmail = (rule, value, callback) => {
-      if (value === "") {
-        callback();
-      } else {
-        if (!validEmail(value)) {
-          callback(new Error("邮箱格式不正确！"));
+        if (!isnumber(value)) {
+          callback(new Error("仅支持整数!"));
         } else {
           callback();
         }
@@ -188,65 +155,77 @@ export default {
       organizeList: [],
       columns: columns.addColumns,
       showModelThis: this.showModel,
-      ruleForm: {
-        username: "", // 账号
+      ruleForm: null,
+      options: [
+        {
+          value: "1",
+          label: "直接发货",
+        },
+        {
+          value: "2",
+          label: "延迟发货",
+        },
+      ],
+      statusOptions: [
+        {
+          value: "1",
+          label: "否",
+        },
+        {
+          value: "2",
+          label: "赠品",
+        },
+        {
+          value: "3",
+          label: "样品",
+        },
+      ],
+      addForm: {
+        username: [], // 账号
         name: "", // 真实姓名
         mobile: "",
         email: "",
         role_id: "",
         status: "1",
-        itemid: [],
+        itemid: "",
       },
       rulesThis: this.rules,
       rules: {
-        name: [
+        username: [
           {
+            type: "array",
             required: true,
-            validator: validatename,
-            trigger: "blur",
+            message: "请选择销售方公司",
+            trigger: "change",
           },
         ],
-        username: [
+        name: [
           {
             required: true,
-            validator: validateusername,
-            trigger: "blur",
+            message: "请选择发货类型",
+            trigger: "change",
           },
         ],
+
         mobile: [
           {
             required: true,
-            validator: validatemobile,
+            validator: validateWeight,
             trigger: "blur",
           },
         ],
-        email: [
-          {
-            required: false,
-            validator: validateEmail,
-            trigger: "blur",
-          },
-        ],
-        role_id: [
+        status: [
           {
             required: true,
-            message: "请选择角色",
+            message: "请选择是否特殊商品",
             trigger: "change",
           },
         ],
         itemid: [
           {
-            type: "array",
             required: true,
-            message: "请选择所在部门",
-            trigger: "change",
-          },
-        ],
-        status: [
-          {
-            required: true,
-            message: "请选择状态",
-            trigger: "change",
+            message: "请输入备注",
+            trigger: "blur",
           },
         ],
       },
@@ -269,13 +248,16 @@ export default {
     closeModel() {
       console.log("closeModel!!");
     },
-    itemidChange(e) {
-      console.log(e);
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
+    async supplierChange(e) {
+      if (e && e.id) {
+        this.addForm.username = [e.code];
+      } else {
+        this.addForm.username = [];
+      }
+      this.$refs.addForm.validateField("username");
     },
+
     async initForm() {
-      this.title = "添加咨询订单";
       this.loading = true;
       this.rulesThis = this.rules;
       await this.resetForm();
@@ -286,6 +268,13 @@ export default {
       const res = await asyncRequest.detail({ id: this.id });
       if (res && res.code === 0 && res.data) {
         this.ruleForm = res.data;
+        const { can } = res.data;
+        this.ruleForm.class_cat = "";
+        if (can && can.length > 0) {
+          can.forEach((x, i) => {
+            this.ruleForm.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
         this.ruleForm.mark_fee = this.setNum(this.ruleForm.mark_fee);
         this.ruleForm.cert_fee = this.setNum(this.ruleForm.cert_fee);
         this.ruleForm.package_fee = this.setNum(this.ruleForm.package_fee);
@@ -309,7 +298,20 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.ruleForm =null
+          this.ruleForm = null;
+        }
+        if (this.$refs.addForm) {
+          this.$refs.addForm.resetFields();
+          this.$refs.addForm.clearValidate();
+          this.addForm = {
+            username: [],
+            name: "", // 真实姓名
+            mobile: "",
+            email: "",
+            role_id: "",
+            status: "1",
+            itemid: [],
+          };
         }
       });
     },

src/views/sellOut/consultSheet/columnsForm.js

@@ -5,6 +5,21 @@ export default {
         //     label: "数据标题",
         //     col: "8",
         // },
+        {
+            prop: "zxNo",
+            label: "咨询单号",
+            col: "8",
+        },
+        {
+            prop: "zxtime",
+            label: "咨询日期",
+            col: "8",
+        },
+        {
+            prop: "zxtype",
+            label: "咨询类型",
+            col: "8",
+        },
         {
             prop: "sequenceNo",
             label: "单据号",
@@ -25,42 +40,33 @@ export default {
             label: "采购人员",
             col: "8",
         },
-
         {
-            prop: "brank",
-            label: "品牌",
-            col: "8",
-        },
-
-        {
-            prop: "cat_f",
-            label: "一级分类",
+            prop: "num",
+            label: "需求数量",
             col: "8",
         },
         {
-            prop: "cat_s",
-            label: "二级分类",
+            prop: "sale_fee",
+            label: "最终销售单价",
             col: "8",
         },
 
+
+
         {
-            prop: "wsm_type",
-            label: "库房性质",
-            col: "8",
-        },
-        {
-            prop: "model",
-            label: "型号",
-            col: "8",
+            prop: "khname",
+            label: "客户名称",
+            col: "16",
         },
         {
             prop: "khNo",
             label: "客户编码",
             col: "8",
         },
+
         {
-            prop: "khname",
-            label: "客户名称",
+            prop: "cpName",
+            label: "产品名称",
             col: "16",
         },
         {
@@ -68,53 +74,55 @@ export default {
             label: "产品编码",
             col: "8",
         },
+
         {
-            prop: "cpName",
-            label: "产品名称",
+            prop: "class_cat",
+            label: "商品分类",
             col: "16",
         },
-
-
         {
-            prop: "material",
-            label: "材质",
+            prop: "expiry_day",
+            label: "信息有效期",
+            unit: "天",
             col: "8",
         },
         {
-            prop: "color",
-            label: "颜色",
-            col: "8",
+            prop: "desc",
+            label: "工艺说明",
+            col: "16",
         },
         {
-            prop: "unit",
-            label: "单位",
+            prop: "model",
+            label: "型号",
             col: "8",
         },
         {
-            prop: "zxNo",
-            label: "咨询单号",
+            prop: "specs",
+            label: "规格",
             col: "8",
         },
+
+        // {
+        //     prop: "cat_s",
+        //     label: "二级分类",
+        //     col: "8",
+        // },
+
         {
-            prop: "zxtime",
-            label: "咨询日期",
+            prop: "material",
+            label: "材质",
             col: "8",
         },
         {
-            prop: "zxtype",
-            label: "咨询类型",
+            prop: "color",
+            label: "颜色",
             col: "8",
         },
         {
-            prop: "specs",
-            label: "规格",
+            prop: "unit",
+            label: "单位",
             col: "8",
         },
-        {
-            prop: "desc",
-            label: "工艺说明",
-            col: "16",
-        },
         {
             prop: "metals",
             label: "贵金属种类",
@@ -137,12 +145,7 @@ export default {
             unit: "天",
             col: "8",
         },
-        {
-            prop: "expiry_day",
-            label: "信息有效期",
-            unit: "天",
-            col: "8",
-        },
+
         // {
         //     prop: "min_num",
         //     label: "最低一次一地起订量",
@@ -235,23 +238,26 @@ export default {
             label: "采购定价",
             col: "8",
         },
+        {
+            prop: "brank",
+            label: "品牌",
+            col: "8",
+        },
+
+
 
+        {
+            prop: "wsm_type",
+            label: "库房性质",
+            col: "8",
+        },
         // {
         //     prop: "cgremark",
         //     label: "采购备注",
         //     col: "8",
         // },
 
-        {
-            prop: "num",
-            label: "需求数量",
-            col: "8",
-        },
-        {
-            prop: "sale_fee",
-            label: "最终销售单价",
-            col: "8",
-        },
+
         // {
         //     prop: "cfNo",
         //     label: "采反单号",
@@ -314,58 +320,52 @@ export default {
         // },
     ],
     addColumns: [
-
+        // {
+        //     prop: "name",
+        //     label: "数据标题",
+        //     col: "8",
+        // },
         {
-            prop: "cpzxNo",
-            label: "产品咨询单号",
+            prop: "zxNo",
+            label: "咨询单号",
             col: "8",
         },
         {
-            prop: "cpNo",
-            label: "产品编码",
+            prop: "zxtime",
+            label: "咨询日期",
             col: "8",
         },
         {
-            prop: "cpName",
-            label: "产品名称",
-            col: "16",
-        },
-        {
-            prop: "khNo",
-            label: "客户编码",
+            prop: "zxtype",
+            label: "咨询类型",
             col: "8",
         },
+        // {
+        //     prop: "sequenceNo",
+        //     label: "单据号",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "cpzxNo",
+        //     label: "产品咨询单号",
+        //     col: "8",
+        // },
         {
-            prop: "khname",
-            label: "客户名称",
-            col: "16",
-        },
-        {
-            prop: "saler",
-            label: "采购人员",
+            prop: "salesman",
+            label: "咨询人员",
             col: "8",
         },
+        // {
+        //     prop: "saler",
+        //     label: "采购人员",
+        //     col: "8",
+        // },
 
         {
             prop: "num",
             label: "咨询数量",
             col: "8",
         },
-        {
-            prop: "num",
-            label: "销售数量",
-            col: "8",
-        },
-        {
-            prop: "num",
-            label: "销售总额",
-            col: "8",
-        },
-        {
-            prop: "sale_fee",
-            label: "要求到货时间",
-            col: "8",
-        },
         {
             prop: "sale_fee",
             label: "最终销售单价",
@@ -373,65 +373,34 @@ export default {
         },
 
 
-
-
-        // {
-        //     prop: "name",
-        //     label: "数据标题",
-        //     col: "8",
-        // },
         {
-            prop: "sequenceNo",
-            label: "单据号",
-            col: "8",
+            prop: "khname",
+            label: "客户名称",
+            col: "16",
         },
-       
         {
-            prop: "salesman",
-            label: "申请人",
+            prop: "khNo",
+            label: "客户编码",
             col: "8",
         },
-      
 
-        {
-            prop: "brank",
-            label: "品牌",
-            col: "8",
-        },
 
         {
-            prop: "cat_f",
-            label: "一级分类",
-            col: "8",
+            prop: "cpName",
+            label: "产品名称",
+            col: "16",
         },
         {
-            prop: "cat_s",
-            label: "二级分类",
+            prop: "cpNo",
+            label: "产品编码",
             col: "8",
         },
 
-        {
-            prop: "wsm_type",
-            label: "库房性质",
-            col: "8",
-        },
-        {
-            prop: "model",
-            label: "型号",
-            col: "8",
-        },
-     
-      
 
         {
-            prop: "material",
-            label: "材质",
-            col: "8",
-        },
-        {
-            prop: "color",
-            label: "颜色",
-            col: "8",
+            prop: "class_cat",
+            label: "商品分类",
+            col: "16",
         },
         {
             prop: "unit",
@@ -439,30 +408,51 @@ export default {
             col: "8",
         },
         {
-            prop: "zxNo",
-            label: "咨询单号",
-            col: "8",
-        },
-        {
-            prop: "zxtime",
-            label: "咨询日期",
-            col: "8",
-        },
-        {
-            prop: "zxtype",
-            label: "咨询类型",
+            prop: "work_day",
+            label: "产品工期",
+            unit: "天",
             col: "8",
         },
+        // {
+        //     prop: "expiry_day",
+        //     label: "信息有效期",
+        //     unit: "天",
+        //     col: "8",
+        // },
         {
-            prop: "specs",
-            label: "规格",
+            prop: "model",
+            label: "型号",
             col: "8",
         },
-        {
-            prop: "desc",
-            label: "工艺说明",
-            col: "16",
-        },
+        // {
+        //     prop: "specs",
+        //     label: "规格",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "desc",
+        //     label: "工艺说明",
+        //     col: "16",
+        // },
+        // {
+        //     prop: "cat_s",
+        //     label: "二级分类",
+        //     col: "8",
+        // },
+
+        // {
+        //     prop: "material",
+        //     label: "材质",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "color",
+        //     label: "颜色",
+        //     col: "8",
+        // },
+
+
+
         {
             prop: "metals",
             label: "贵金属种类",
@@ -479,18 +469,7 @@ export default {
             unit: "天",
             col: "8",
         },
-        {
-            prop: "work_day",
-            label: "产品工期",
-            unit: "天",
-            col: "8",
-        },
-        {
-            prop: "expiry_day",
-            label: "信息有效期",
-            unit: "天",
-            col: "8",
-        },
+
         // {
         //     prop: "min_num",
         //     label: "最低一次一地起订量",
@@ -501,47 +480,47 @@ export default {
         //     label: "发货方式",
         //     col: "8",
         // },
-        {
-            prop: "mark_fee",
-            label: "加标费",
-            col: "8",
-        },
-        {
-            prop: "cert_fee",
-            label: "证书费",
-            col: "8",
-        },
-        {
-            prop: "package_fee",
-            label: "包装费",
-            col: "8",
-        },
-        {
-            prop: "open_fee",
-            label: "开模费",
-            col: "8",
-        },
+        // {
+        //     prop: "mark_fee",
+        //     label: "加标费",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "cert_fee",
+        //     label: "证书费",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "package_fee",
+        //     label: "包装费",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "open_fee",
+        //     label: "开模费",
+        //     col: "8",
+        // },
 
-        {
-            prop: "cost_fee",
-            label: "成本工艺费",
-            col: "8",
-        },
-        {
-            prop: "delivery_fee",
-            label: "物流费",
-            col: "8",
-        },
+        // {
+        //     prop: "cost_fee",
+        //     label: "成本工艺费",
+        //     col: "8",
+        // },
+        // {
+        //     prop: "delivery_fee",
+        //     label: "物流费",
+        //     col: "8",
+        // },
         // {
         //     prop: "bare_fee",
         //     label: "产品裸价",
         //     col: "8",
         // },
-        {
-            prop: "total_fee",
-            label: "成本合计",
-            col: "8",
-        },
+        // {
+        //     prop: "total_fee",
+        //     label: "成本合计",
+        //     col: "8",
+        // },
         // {
         //     prop: "gold_price",
         //     label: "当日进价",
@@ -560,11 +539,11 @@ export default {
         //     label: "付款方式",
         //     col: "8",
         // },
-        {
-            prop: "tax",
-            label: "税点",
-            col: "8",
-        },
+        // {
+        //     prop: "tax",
+        //     label: "税点",
+        //     col: "8",
+        // },
 
         // {
         //     prop: "addr",
@@ -572,17 +551,17 @@ export default {
         //     col: "8",
         // },
 
-        {
-            prop: "sale_craft",
-            label: "销售工艺费",
-            col: "8",
-        },
+        // {
+        //     prop: "sale_craft",
+        //     label: "销售工艺费",
+        //     col: "8",
+        // },
 
-        {
-            prop: "sale_price",
-            label: "采购定价",
-            col: "8",
-        },
+        // {
+        //     prop: "sale_price",
+        //     label: "采购定价",
+        //     col: "8",
+        // },
 
         // {
         //     prop: "cgremark",
@@ -590,7 +569,20 @@ export default {
         //     col: "8",
         // },
 
-   
+
+        // {
+        //     prop: "brank",
+        //     label: "品牌",
+        //     col: "8",
+        // },
+
+
+
+        // {
+        //     prop: "wsm_type",
+        //     label: "库房性质",
+        //     col: "8",
+        // },
         // {
         //     prop: "cfNo",
         //     label: "采反单号",

src/views/sellOut/consultSheet/index.vue

@@ -181,7 +181,7 @@
         @refresh="searchList"
         @cancel="showModel = false"
       />
-      <!---新建咨询订单--->
+      <!-- -新建咨询订单- -->
       <add-edit
         :id="addModelId"
         :sitem="sitem"
@@ -321,6 +321,12 @@ export default {
           label: "产品名称",
           "min-width": "160px",
         },
+          {
+          prop: "class_cat",
+          label: "商品分类",
+          "width": "100px",
+        },
+
         {
           prop: "unit",
           label: "单位",
@@ -485,6 +491,12 @@ export default {
         this.tableData.map((v) => {
           v.sale_price = this.setNum(v.sale_price);
           v.sale_fee = this.setNum(v.sale_fee);
+          v.class_cat = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.class_cat += i === 0 ? x.name : "/" + x.name;
+            });
+          }
           return v;
         });
         this.pageInfo.total = Number(res.data.count);

src/views/sellOut/consultSheet/showDetailModel.vue

@@ -23,11 +23,17 @@
         id="demo-ruleForm"
       >
         <el-row v-if="ruleForm !== null">
-          <el-col v-for="item in columns" :key="item.prop" :span="item.col">
-            <el-form-item :label="item.label + ':'">
-              <div>{{ ruleForm[item.prop] }}{{ item.unit }}</div>
-            </el-form-item>
-          </el-col>
+          <template v-for="item in columns">
+            <el-col
+              :key="item.prop"
+              :span="item.col"
+              v-if="ruleForm[item.prop]"
+            >
+              <el-form-item :label="item.label + ':'">
+                <div>{{ ruleForm[item.prop] }}{{ item.unit }}</div>
+              </el-form-item>
+            </el-col>
+          </template>
         </el-row>
       </el-form>
     </el-card>
@@ -76,6 +82,13 @@ export default {
       const res = await asyncRequest.detail({ id: this.id });
       if (res && res.code === 0 && res.data) {
         this.ruleForm = res.data;
+        const { can } = res.data;
+        this.ruleForm.class_cat = "";
+        if (can && can.length > 0) {
+          can.forEach((x, i) => {
+            this.ruleForm.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
         this.ruleForm.mark_fee = this.setNum(this.ruleForm.mark_fee);
         this.ruleForm.cert_fee = this.setNum(this.ruleForm.cert_fee);
         this.ruleForm.package_fee = this.setNum(this.ruleForm.package_fee);

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

@@ -166,6 +166,34 @@
           </el-form>
         </el-col>
         <el-col :span="24" style="padding: 0 0 22px 0">
+          <div style="height: 30px">
+            <el-tooltip
+              class="fr"
+              style="margin: 3px 0 0 0"
+              effect="dark"
+              content="下载收货地址模板"
+              placement="top"
+            >
+              <i
+                class="el-icon-circle-plus-outline tb-icon"
+                style="color: #63cbe7"
+                @click="DownloadTemplate"
+              ></i>
+            </el-tooltip>
+            <!-- <el-tooltip
+              class="fr"
+              style="margin: 3px 0 0 0"
+              effect="dark"
+              content="下载收货地址模板"
+              placement="top"
+            >
+              <i
+                class="el-icon-circle-plus-outline tb-icon"
+                style="color: #63cbe7"
+                @click="openHouseModal(-1)"
+              ></i>
+            </el-tooltip> -->
+          </div>
           <el-form :model="addrForm" ref="addrForm" :size="'mini'">
             <el-table
               :data="addrForm.order_addr"
@@ -300,6 +328,7 @@
               <el-table-column fixed="right" width="80">
                 <template slot="header" slot-scope="scope">
                   <span>操作</span>
+
                   <el-tooltip
                     class="fr"
                     style="margin: 3px 0 0 0"
@@ -488,7 +517,12 @@ export default {
       console.log("closeModel!!");
       this.showModelThis = false;
     },
-
+    DownloadTemplate() {
+      if(!this.loading){
+        this.loading=false
+        
+      }
+    },
     goods_class_change(e) {
       this.ruleForm.goods_class = e;
       this.cat_id = e.length > 0 ? e[e.length - 1] : "";

src/views/sellOut/salesOrder/index.vue

@@ -26,7 +26,36 @@
         <template #table-header="{}">
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
-              <el-col :span="4" style="width: 150px">
+                  <el-col :span="4" style="width: 120px">
+                <el-dropdown @command="handleClick($event)" :size="searchSize">
+                  <el-button :size="searchSize" style="width: 120px">
+                    {{ sselect }}
+                    <i
+                      class="el-icon-arrow-down el-icon--right"
+                      :size="searchSize"
+                    ></i>
+                  </el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item
+                      v-for="item in options"
+                      :key="item"
+                      :command="item"
+                      >{{ item }}</el-dropdown-item
+                    >
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </el-col>
+              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
+                <period-date-picker
+                  :type="1"
+                  :width="'135px'"
+                  :size="searchSize"
+                  :start="timeOBJ.start"
+                  :end="timeOBJ.end"
+                  @timeReturned="handleTime"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
                 <el-select
                   :size="searchSize"
                   v-model="parmValue.status"
@@ -48,7 +77,7 @@
                   />
                 </el-select>
               </el-col>
-              <el-col :span="4" style="width: 370px; padding: 0 0 0 10px">
+              <!-- <el-col :span="4" style="width: 370px; padding: 0 0 0 10px">
                 <search-supplier
                   :size="searchSize"
                   :value="parmValue.supplierNo"
@@ -69,7 +98,7 @@
                   :companyCode="supplierNo"
                   @searchChange="stockChange"
                 />
-              </el-col>
+              </el-col> -->
               <el-col :span="3" style="width: 66px; float: right">
                 <el-button
                   :size="searchSize"
@@ -82,38 +111,10 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <el-col :span="4" style="width: 120px">
-                <el-dropdown @command="handleClick($event)" :size="searchSize">
-                  <el-button :size="searchSize" style="width: 120px">
-                    {{ sselect }}
-                    <i
-                      class="el-icon-arrow-down el-icon--right"
-                      :size="searchSize"
-                    ></i>
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      v-for="item in options"
-                      :key="item"
-                      :command="item"
-                      >{{ item }}</el-dropdown-item
-                    >
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </el-col>
-              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
-                <period-date-picker
-                  :type="1"
-                  :width="'135px'"
-                  :size="searchSize"
-                  :start="timeOBJ.start"
-                  :end="timeOBJ.end"
-                  @timeReturned="handleTime"
-                />
-              </el-col>
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+          
+              <el-col :span="6" style="width: 500px;">
                 <el-input
-                  placeholder="编号"
+                  placeholder="关键字"
                   v-model="input"
                   :size="searchSize"
                   class="input-with-select"
@@ -125,12 +126,12 @@
                     placeholder="请选择"
                   >
                     <el-option label="采购单编号" value="1"></el-option>
-                    <el-option label="入库单编号" value="2"></el-option>
+                    <!-- <el-option label="入库单编号" value="2"></el-option> -->
                     <el-option label="备库编号" value="3"></el-option>
                     <el-option label="商品属性编号" value="4"></el-option>
                     <el-option label="产品名称" value="5"></el-option>
                     <el-option label="申请人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                   </el-select>
                   <el-button slot="append" icon="el-icon-search"></el-button>
                 </el-input>

src/views/stock/check/components/addEdit.vue

@@ -268,6 +268,7 @@ export default {
 
    <style lang="scss" scoped>
 .check {
+
 }
 </style>