暂存

src/components/search-brand/http.js

@@ -1,8 +1,8 @@
 import http from "@/apis/axios";
-const api = "admin/";
+const api = "abutment/";
 export default {
   // 列表
-  list: (data, params) => http(api + "brandlist", data, "post", params),
+  list: (data, params) => http(api + "brandList", data, "post", params),
   //  // 获取仓库  供应商仓/自建仓
   //  warequery: (data, params) => http(api + "warequery", data, "post", params),
 };

src/components/search-exclusive/http.js

@@ -1,6 +1,6 @@
 import http from "@/apis/axios";
-const api = "admin/";
+const api = "abutment/";
 export default {
   // 列表
-  list: (data, params) => http(api + "excluquery", data, "post", params),
+  list: (data, params) => http(api + "getExclusiveList", data, "post", params),
 };

src/components/search-work-company/http.js

@@ -1,6 +1,6 @@
 import http from "@/apis/axios";
-const api = "admin/";
+const api = "abutment/";
 export default {
   // 列表
-  list: (data, params) => http(api + "businesslist", data, "post", params),
+  list: (data, params) => http(api + "businessList", data, "post", params),
 };

src/components/select-area/http.js

@@ -0,0 +1,10 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+    //省份列表
+    provinceList: (data, params) => http(api + "province", data, "post", params),
+    // 城市列表
+    cityList: (data, params) => http(api + "city", data, "post", params),
+    // 县级区级列表
+    areaList: (data, params) => http(api + "area", data, "post", params),
+};

src/components/select-area/main.vue

@@ -0,0 +1,124 @@
+<template>
+  <div class="select-area">
+    <el-cascader
+      v-if="!loading"
+      :size="size || 'medium'"
+      style="width: 100%"
+      filterable
+      clearable
+      v-model="value"
+      :placeholder="placeholder || ''"
+      :props="props"
+      :disabled="disabled"
+      @change="handleChange"
+    ></el-cascader>
+    <div class="loading-input" :class="{ disabled: disabled }" v-else>
+      <i class="el-icon-loading"></i>
+      <span>{{ placeholder || "" }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "./http";
+export default {
+  name: "SelectArea",
+  props: ["size", "value", "isDetail", "placeholder", "disabled"],
+  /**
+   * 属性集合
+   * @param {String}        size                   : 组件大小 非必填
+   * @param {Array}         value                  : 选中值  必填
+   * @param {String}        placeholder            : 提示信息            非必填
+   * @param {Boolean}       isDetail               : 是否是详情逻辑       必填
+   * @param {Boolean}       disabled               : 是否禁用            必填
+   */
+  /**
+   * 事件集合
+   * @selectChange            : 选中值变化调用   抛出选中数据
+   */
+  watch: {
+    value: function (val, old) {
+      if (val) {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+        }, 10);
+      }
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      props: {
+        lazy: true, //开启远程加载
+        expandTrigger: "hover",
+        async lazyLoad(node, resolve) {
+          // console.log(node);
+          const { level, value, root, loading } = node;
+          let list = [];
+          let res = {};
+          if (level === 0) {
+            res = await asyncRequest.provinceList({});
+          } else if (level === 1) {
+            res = await asyncRequest.cityList({ code: value });
+          } else {
+            res = await asyncRequest.areaList({ code: value });
+          }
+          const { code, data } = res;
+          if (code === 0) {
+            data.forEach((v1) => {
+              let province = {
+                value:
+                  level === 0
+                    ? v1.province_code
+                    : level === 1
+                    ? v1.city_code
+                    : v1.area_code,
+                label: v1.name,
+                leaf: level >= 2,
+              };
+              list.push(province);
+            });
+            resolve(list);
+          } else {
+            resolve([]);
+          }
+        },
+      },
+    };
+  },
+  methods: {
+    // getCheckedNodes(e) {
+    //    @getCheckedNodes="getCheckedNodes"
+    // },
+    handleChange(value) {
+      this.$emit("selectChange", value);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.select-area {
+  .loading-input {
+    background-color: transparent;
+    border: 1px solid #dfe4ed;
+    color: #c0c4cc;
+    width: 100%;
+    height: 36px;
+    line-height: 36px;
+    padding: 0 30px 0 12px;
+    border-radius: 4px;
+    &.disabled {
+      background-color: #f5f7fa;
+    }
+    span {
+      font-size: 16px;
+      height: 36px;
+      line-height: 36px;
+      padding: 0 0 0 3px;
+      vertical-align: top;
+    }
+  }
+}
+</style>

src/components/status-bar/main.vue

@@ -1,50 +0,0 @@
-<template>
-  <div class="statusBar" style="padding: 0 0 12px 0">
-    <el-steps :active="sIndex" align-center :size="'mini'" :process-status="(sIndex+1)===options.length?'finish':'process'">
-      <!-- : index === sIndex
-            ? 'el-icon-s-check' -->
-
-      <el-step
-        :title=" item.value+ '-' +item.label"
-        :icon="index <= sIndex ? 'el-icon-success' : ''"
-        v-for="(item, index) in options"
-        :key="item.value + index"
-      ></el-step>
-    </el-steps>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "statusBar",
-  props: ["options", "status", "newTime"],
-  /**
-   * 属性集合
-   * @param {Array}       options                 : 状态条数组        必填
-   * @param {String}       status                  : 当前状态          必填
-   */
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.getList();
-      }
-    },
-  },
-  mounted() {
-    this.getList();
-  },
-  data() {
-    return {
-      sIndex: 0,
-    };
-  },
-  methods: {
-    getList() {
-      this.sIndex = this.options.findIndex((v) => v.value === this.status);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/goodsCost/index.vue

@@ -144,7 +144,7 @@
                 :size="searchSize"
                 type="success"
                 style="float: right"
-                @click="routeGoto('goodsCost/gDetail', { id: 'add', type: 'add' })"
+                @click="routeGoto('/goodsCost/gDetail', { id: 'add', type: 'add' })"
               >
                 添加
               </el-button>

src/views/workbench/columns.js

@@ -182,14 +182,14 @@ const rules = {
     },
   ],
 
-  supplierNo: [
-    {
-      type: "array",
-      required: true,
-      message: "请选择供应商",
-      trigger: "change",
-    },
-  ],
+  // supplierNo: [
+  //   {
+  //     type: "array",
+  //     required: true,
+  //     message: "请选择供应商",
+  //     trigger: "change",
+  //   },
+  // ],
   delivery_day: [
     {
       required: true,

src/views/workbench/components/baseForm.vue

@@ -28,7 +28,7 @@
           >保 存
         </el-button>
       </el-col>
-      <el-col :span="16">
+      <!-- <el-col :span="16">
         <el-form-item label="供应商" prop="supplierNo">
           <search-supplier
             :value="ruleForm.supplierNo"
@@ -40,73 +40,18 @@
             @searchChange="supplierNosearchChange"
           />
         </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item label="品牌" prop="brandid" label-width="60px">
-          <search-brand
-            :value="ruleForm.brandid"
-            :size="'mini'"
-            :disabled="false"
-            :isDetail="true"
-            :names="brand_name"
-            :placeholder="'品牌'"
-            @searchChange="brandidsearchChange"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="5">
-        <el-form-item label="有效期" prop="expire_day">
-          <digital-input
-            :values="ruleForm.expire_day"
-            :placeholder="'有效期'"
-            :min="1"
-            :max="100000000000"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :disabled="type === 'view'"
-            :controls="false"
-            :append="'天'"
-            @reschange="number_change($event, 'expire_day')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="5">
-        <el-form-item label="物流时间" prop="delivery_day">
-          <digital-input
-            :values="ruleForm.delivery_day"
-            :placeholder="'物流时间'"
-            :min="0"
-            :max="100000000000"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :disabled="type === 'view'"
-            :controls="false"
-            :append="'天'"
-            @reschange="number_change($event, 'delivery_day')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="5">
-        <el-form-item label="生产工期" prop="work_day">
-          <digital-input
-            :values="ruleForm.work_day"
-            :placeholder="'生产工期'"
-            :min="0"
-            :max="100000000000"
+      </el-col> -->
+      <el-col :span="18">
+        <el-form-item label="商品名称" prop="pname">
+          <el-input
+            placeholder="商品名称"
+            maxlength="100"
             :disabled="type === 'view'"
-            :position="'right'"
-            :precision="0"
-            :size="'mini'"
-            :controls="false"
-            :append="'天'"
-            @reschange="number_change($event, 'work_day')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="5">
+            v-model="ruleForm.pname"
+          ></el-input> </el-form-item
+      ></el-col>
+
+      <el-col :span="6">
         <el-form-item label="税点" prop="tax" label-width="60px">
           <search-tax
             :value="ruleForm.tax"
@@ -118,19 +63,6 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="4">
-        <el-form-item label="单位" prop="unit_id" label-width="60px">
-          <search-unit
-            :value="ruleForm.unit_id"
-            :size="'mini'"
-            :isDetail="true"
-            :names="unit_name"
-            :disabled="false"
-            :placeholder="'单位'"
-            @searchChange="unitsearchChange"
-          />
-        </el-form-item>
-      </el-col>
 
       <el-col :span="24">
         <el-row>
@@ -146,13 +78,16 @@
                 @searchChange="cat_id_change"
               />
             </el-form-item>
-            <el-form-item label="商品名称" prop="pname">
-              <el-input
-                placeholder="商品名称"
-                maxlength="100"
-                :disabled="type === 'view'"
-                v-model="ruleForm.pname"
-              ></el-input>
+            <el-form-item label="品牌" prop="brandid">
+              <search-brand
+                :value="ruleForm.brandid"
+                :size="'mini'"
+                :disabled="false"
+                :isDetail="true"
+                :names="brand_name"
+                :placeholder="'品牌'"
+                @searchChange="brandidsearchChange"
+              />
             </el-form-item>
             <el-form-item label="产地" prop="origin_place">
               <select-area
@@ -229,62 +164,136 @@
           </el-col>
         </el-row>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="总重量" prop="weight">
-          <digital-input
-            :values="ruleForm.weight"
-            :placeholder="'总重量'"
-            :min="0"
-            :max="100000000000"
-            :position="'right'"
-            :precision="3"
-            :disabled="type === 'view'"
-            :size="'mini'"
-            :controls="false"
-            :append="'g'"
-            @reschange="number_change($event, 'weight')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="供货区域" prop="supply_area">
-          <el-select
-            v-model="ruleForm.supply_area"
-            filterable
-            :disabled="type === 'view'"
-            clearable
-            style="width: 100%"
-            placeholder="供货区域"
-          >
-            <el-option
-              v-for="group in options6"
-              :key="group.id"
-              :label="group.name"
-              :value="group.id"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="付款方式" prop="pay_way" class="clear">
-          <el-select
-            v-model="ruleForm.pay_way"
-            filterable
-            :disabled="type === 'view'"
-            clearable
-            style="width: 100%"
-            placeholder="付款方式"
-          >
-            <el-option
-              v-for="group in options10"
-              :key="group.id"
-              :label="group.name"
-              :value="group.id"
-            />
-          </el-select>
-        </el-form-item>
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="24">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="有效期" prop="expire_day">
+                  <digital-input
+                    :values="ruleForm.expire_day"
+                    :placeholder="'有效期'"
+                    :min="1"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :disabled="type === 'view'"
+                    :controls="false"
+                    :append="'天'"
+                    @reschange="number_change($event, 'expire_day')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="物流时间" prop="delivery_day">
+                  <digital-input
+                    :values="ruleForm.delivery_day"
+                    :placeholder="'物流时间'"
+                    :min="0"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :disabled="type === 'view'"
+                    :controls="false"
+                    :append="'天'"
+                    @reschange="number_change($event, 'delivery_day')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="生产工期" prop="work_day">
+                  <digital-input
+                    :values="ruleForm.work_day"
+                    :placeholder="'生产工期'"
+                    :min="0"
+                    :max="100000000000"
+                    :disabled="type === 'view'"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :controls="false"
+                    :append="'天'"
+                    @reschange="number_change($event, 'work_day')"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="单位" prop="unit_id" label-width="60px">
+                  <search-unit
+                    :value="ruleForm.unit_id"
+                    :size="'mini'"
+                    :isDetail="true"
+                    :names="unit_name"
+                    :disabled="false"
+                    :placeholder="'单位'"
+                    @searchChange="unitsearchChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="总重量" prop="weight">
+              <digital-input
+                :values="ruleForm.weight"
+                :placeholder="'总重量'"
+                :min="0"
+                :max="100000000000"
+                :position="'right'"
+                :precision="3"
+                :disabled="type === 'view'"
+                :size="'mini'"
+                :controls="false"
+                :append="'g'"
+                @reschange="number_change($event, 'weight')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="供货区域" prop="supply_area">
+              <el-select
+                v-model="ruleForm.supply_area"
+                filterable
+                :disabled="type === 'view'"
+                clearable
+                style="width: 100%"
+                placeholder="供货区域"
+              >
+                <el-option
+                  v-for="group in options6"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="付款方式" prop="pay_way" class="clear">
+              <el-select
+                v-model="ruleForm.pay_way"
+                filterable
+                :disabled="type === 'view'"
+                clearable
+                style="width: 100%"
+                placeholder="付款方式"
+              >
+                <el-option
+                  v-for="group in options10"
+                  :key="group.id"
+                  :label="group.name"
+                  :value="group.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-col>
-      <el-col :span="6">
+      <!-- <el-col :span="6">
         <el-form-item label="发货方式" prop="send_way" class="clear">
           <el-select
             v-model="ruleForm.send_way"
@@ -302,175 +311,185 @@
             />
           </el-select>
         </el-form-item>
+      </el-col> -->
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="证书费" prop="cert_fee">
+              <digital-input
+                :values="ruleForm.cert_fee"
+                :placeholder="'证书费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'cert_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="包装费" prop="pakge_fee">
+              <digital-input
+                :values="ruleForm.pakge_fee"
+                :placeholder="'包装费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'pakge_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工艺费" prop="cost_fee">
+              <digital-input
+                :values="ruleForm.cost_fee"
+                :placeholder="'工艺费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'cost_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="加标费" prop="mark_fee">
+              <digital-input
+                :values="ruleForm.mark_fee"
+                :placeholder="'加标费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'mark_fee')"
+              />
+            </el-form-item> </el-col
+        ></el-row>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="证书费" prop="cert_fee">
-          <digital-input
-            :values="ruleForm.cert_fee"
-            :placeholder="'证书费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'cert_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="包装费" prop="pakge_fee">
-          <digital-input
-            :values="ruleForm.pakge_fee"
-            :placeholder="'包装费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'pakge_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="工艺费" prop="cost_fee">
-          <digital-input
-            :values="ruleForm.cost_fee"
-            :placeholder="'工艺费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'cost_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="加标费" prop="mark_fee">
-          <digital-input
-            :values="ruleForm.mark_fee"
-            :placeholder="'加标费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'mark_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="打样费" prop="demo_fee">
-          <digital-input
-            :values="ruleForm.demo_fee"
-            :placeholder="'打样费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'demo_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="开模费" prop="open_fee">
-          <digital-input
-            :values="ruleForm.open_fee"
-            :placeholder="'开模费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'open_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="物流费" prop="delivery_fee">
-          <digital-input
-            :values="ruleForm.delivery_fee"
-            :placeholder="'物流费'"
-            :min="0"
-            :disabled="type === 'view'"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'delivery_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="6">
-        <el-form-item label="裸价" prop="nake_fee" class="clear">
-          <digital-input
-            :values="ruleForm.nake_fee"
-            :placeholder="'裸价'"
-            :min="0"
-            :disabled="type === 'view' || is_noble"
-            :max="100000000000"
-            :position="'right'"
-            :precision="2"
-            :size="'mini'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'nake_fee')"
-          />
-        </el-form-item>
+
+      <el-col :span="24">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="打样费" prop="demo_fee">
+              <digital-input
+                :values="ruleForm.demo_fee"
+                :placeholder="'打样费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'demo_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="开模费" prop="open_fee">
+              <digital-input
+                :values="ruleForm.open_fee"
+                :placeholder="'开模费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'open_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物流费" prop="delivery_fee">
+              <digital-input
+                :values="ruleForm.delivery_fee"
+                :placeholder="'物流费'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'delivery_fee')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="裸价" prop="nake_fee" class="clear">
+              <digital-input
+                :values="ruleForm.nake_fee"
+                :placeholder="'裸价'"
+                :min="0"
+                :disabled="type === 'view' || is_noble"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'nake_fee')"
+              />
+            </el-form-item> </el-col
+        ></el-row>
       </el-col>
 
       <el-col :span="24" v-show="pid === '6'">
-        <el-col :span="6">
-          <el-form-item label="金属重量" prop="noble_weight">
-            <digital-input
-              :values="ruleForm.noble_weight"
-              :placeholder="'金属重量'"
-              :min="0"
-              :disabled="type === 'view'"
-              :max="100000000000"
-              :position="'right'"
-              :precision="3"
-              :size="'mini'"
-              :controls="false"
-              :append="'g'"
-              @reschange="number_change($event, 'noble_weight')"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="金属种类" prop="metal_id">
-            <search-metal-kind
-              :value="ruleForm.metal_id"
-              :size="'mini'"
-              :disabled="type === 'view'"
-              :isDetail="true"
-              :placeholder="'金属种类'"
-              @searchChange="metal_idsearchChange"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="金属重量" prop="noble_weight">
+              <digital-input
+                :values="ruleForm.noble_weight"
+                :placeholder="'金属重量'"
+                :min="0"
+                :disabled="type === 'view'"
+                :max="100000000000"
+                :position="'right'"
+                :precision="3"
+                :size="'mini'"
+                :controls="false"
+                :append="'g'"
+                @reschange="number_change($event, 'noble_weight')"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="金属种类" prop="metal_id">
+              <search-metal-kind
+                :value="ruleForm.metal_id"
+                :size="'mini'"
+                :disabled="type === 'view'"
+                :isDetail="true"
+                :placeholder="'金属种类'"
+                @searchChange="metal_idsearchChange"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!-- <el-col :span="6">
           <el-form-item label="启用金价" prop="is_gold_price">
             <el-select
               v-model="ruleForm.is_gold_price"
@@ -489,8 +508,8 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-
+        </el-col> -->
+        <!-- 
         <el-col :span="6">
           <el-form-item label="有无工差" prop="is_diff">
             <el-select
@@ -509,36 +528,40 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="配置要求" prop="config">
-            <el-select
-              v-model="ruleForm.config"
-              multiple
-              :disabled="type === 'view'"
-              style="width: 100%"
-              placeholder="配置要求"
-            >
-              <el-option
-                v-for="(item, index) in options9"
-                :key="item + index"
-                :label="item"
-                :value="item"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="其他配置要求" prop="other_config" label-width="120px">
-            <el-input
-              placeholder="其他要求"
-              maxlength="100"
-              :disabled="type === 'view'"
-              v-model="ruleForm.other_config"
-            >
-            </el-input>
-          </el-form-item>
+        </el-col> -->
+        <el-col :span="24">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="配置要求" prop="config">
+                <el-select
+                  v-model="ruleForm.config"
+                  multiple
+                  :disabled="type === 'view'"
+                  style="width: 100%"
+                  placeholder="配置要求"
+                >
+                  <el-option
+                    v-for="(item, index) in options9"
+                    :key="item + index"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="其他配置要求" prop="other_config" label-width="120px">
+                <el-input
+                  placeholder="其他要求"
+                  maxlength="100"
+                  :disabled="type === 'view'"
+                  v-model="ruleForm.other_config"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-col>
       </el-col>
 
@@ -689,7 +712,7 @@ export default {
     return {
       pid: "",
       cat_id_name: "",
-      supplierNo: "",
+      // supplierNo: "",
       brand_name: "",
       unit_name: "",
       title: "",
@@ -789,7 +812,7 @@ export default {
       // }
     },
     async initForm() {
-      this.supplierNo = [];
+      // this.supplierNo = [];
       this.loading = true;
       if (this.type === "add") {
         this.title = "新建采返商品";
@@ -867,7 +890,7 @@ export default {
           unit, //	string	单位
           unit_id, //单位ID
           tax, //string	税率
-          supplierNo, //	string	供应商
+          // supplierNo, //	string	供应商
           cost_desc, //	string	工艺说明
           remark, //	string	采购备注
           weight, //	string	重量
@@ -897,7 +920,7 @@ export default {
           config,
           nake_fee,
           other_config,
-          supplierName,
+          // supplierName,
           specinfo,
         } = JSON.parse(JSON.stringify(data));
         if (specinfo && specinfo.length > 0) {
@@ -912,7 +935,7 @@ export default {
             this.cat_id_name += `${ei !== 0 ? "_" : ""}${e.name}`;
           });
         }
-        this.supplierNo_name = supplierName || "";
+        // this.supplierNo_name = supplierName || "";
         this.is_noble = is_gold_price === "1" && this.pid === "6";
         // this.is_noble = this.askItem.is_metal;
         this.brand_name = brand_name || "";
@@ -922,7 +945,7 @@ export default {
           bidNo: bidNo || "",
           infoNo: this.id || "",
           cat_id: cat_id ? [cat_id] : [],
-          supplierNo: supplierNo ? [supplierNo] : [],
+          // supplierNo: supplierNo ? [supplierNo] : [],
           pname: good_name || "",
           expire_day: expire_day || "1", //有效期
           delivery_day: delivery_day || "0", //物流时间
@@ -944,12 +967,12 @@ export default {
           delivery_fee: delivery_fee || "0.00",
           nake_fee: nake_fee || "0.00",
           pay_way: pay_way || "",
-          send_way: send_way || "",
+          send_way: send_way || "1",
           noble_weight: noble_weight || "0.000",
 
           metal_id: metal_id || "",
-          is_gold_price: is_gold_price || "",
-          is_diff: is_diff || "",
+          is_gold_price: is_gold_price || "0",
+          is_diff: is_diff || "0",
           config: config ? config.split(",") : [],
           other_config: other_config || "",
           remark: remark || "",
@@ -999,10 +1022,12 @@ export default {
             let model = JSON.parse(JSON.stringify(this.ruleForm));
             model.cat_id = model.cat_id[model.cat_id.length - 1];
             model.brandid = model.brandid.toString();
-            model.supplierNo = model.supplierNo.toString();
+            // model.supplierNo = model.supplierNo.toString();
             model.origin_place = model.origin_place.toString();
             model.delivery_place = model.delivery_place.toString();
-
+            model.send_way = "1"; //发货方式 默认供应商包邮
+            model.is_gold_price = "0"; //是否启用实时金价 默认否
+            model.is_diff = "0"; //有无工差 默认无工差
             model.unit_id = model.unit_id.toString();
             model.config = model.config.toString();
             model.tax = parseInt(model.tax + "") + "";
@@ -1074,7 +1099,7 @@ export default {
           this.ruleForm = {
             infoNo: this.id || "",
             cat_id: this.type === "add" ? [this.askItem.cat_id] : [],
-            supplierNo: [],
+            // supplierNo: [],
             pname: this.type === "add" ? this.askItem.good_name : "",
             expire_day: "1", //有效期
             delivery_day: "0", //物流时间
@@ -1099,11 +1124,11 @@ export default {
             delivery_fee: "0.00",
             nake_fee: "0.00",
             pay_way: "",
-            send_way: "",
+            send_way: "1",
             noble_weight: this.type === "add" ? this.askItem.specs_weight : "0.000",
             metal_id: this.type === "add" ? this.askItem.metal_id : "",
-            is_gold_price: this.type === "add" ? this.askItem.is_gold_price : "",
-            is_diff: "",
+            is_gold_price: this.type === "add" ? this.askItem.is_gold_price : "0",
+            is_diff: "0",
             config:
               this.type === "add"
                 ? this.askItem.config
@@ -1191,17 +1216,17 @@ export default {
       }
       this.$refs.ruleForm.validateField("brandid");
     },
-    //供应商选择
-    supplierNosearchChange(e) {
-      console.log(e);
-      const { id, code, label } = e;
-      if (id) {
-        this.ruleForm.supplierNo = [code];
-      } else {
-        this.ruleForm.supplierNo = [];
-      }
-      this.$refs.ruleForm.validateField("supplierNo");
-    },
+    // //供应商选择
+    // supplierNosearchChange(e) {
+    //   console.log(e);
+    //   const { id, code, label } = e;
+    //   if (id) {
+    //     this.ruleForm.supplierNo = [code];
+    //   } else {
+    //     this.ruleForm.supplierNo = [];
+    //   }
+    //   this.$refs.ruleForm.validateField("supplierNo");
+    // },
     //税点选择
     taxsearchChange(e) {
       this.ruleForm.tax = e;
@@ -1338,7 +1363,7 @@ export default {
       this.ruleForm = {
         infoNo: "",
         cat_id: [],
-        supplierNo: [],
+        // supplierNo: [],
         pname: "",
         expire_day: "1", //有效期
         delivery_day: "0", //物流时间
@@ -1362,11 +1387,11 @@ export default {
         delivery_fee: "0.00",
         nake_fee: "0.00",
         pay_way: "",
-        send_way: "",
+        send_way: "1",
         noble_weight: "0.000",
         metal_id: "",
-        is_gold_price: "",
-        is_diff: "",
+        is_gold_price: "0",
+        is_diff: "0",
         config: [],
         other_config: "",
         remark: "",
@@ -1383,7 +1408,7 @@ export default {
       this.ruleForm = {
         infoNo: "",
         cat_id: [],
-        supplierNo: [],
+        // supplierNo: [],
         pname: "",
         expire_day: "1", //有效期
         delivery_day: "0", //物流时间
@@ -1407,11 +1432,11 @@ export default {
         delivery_fee: "0.00",
         nake_fee: "0.00",
         pay_way: "",
-        send_way: "",
+        send_way: "1",
         noble_weight: "0.000",
         metal_id: "",
-        is_gold_price: "",
-        is_diff: "",
+        is_gold_price: "0",
+        is_diff: "0",
         config: [],
         other_config: "",
         remark: "",