戴艳蓉 пре 3 година
родитељ
комит
39a081c45f

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/app.dcbe7c8d.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/css/chunk-0edf86e8.03c5ca80.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/chunk-0edf86e8.57a967c1.js


+ 10 - 10
src/styles/index.scss

@@ -606,29 +606,29 @@ aside {
     float: left;
     border: 1px solid rgb(220, 223, 230);
     box-sizing: border-box;
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 74px;
+    height: 74px;
+    line-height: 74px;
     text-align: center;
   }
   .Upload {
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 74px;
+    height: 74px;
+    line-height: 74px;
     text-align: center;
     position: absolute;
     line-height: 0px;
     top: 0;
     left: 0;
-    line-height: 102px;
+    line-height: 74px;
   }
   .fileUp {
     vertical-align: top;
   }
   .avatar {
-    width: 102px;
-    height: 102px;
-    line-height: 102px;
+    width: 74px;
+    height: 74px;
+    line-height: 74px;
     text-align: center;
   }
   .avatar-uploader .el-upload:hover {

+ 2 - 2
src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1675,8 +1675,8 @@ export default {
         height: 107px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 102px;
-          height: 102px;
+          width: 74px;
+          height: 74px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;

+ 1 - 1
src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -77,7 +77,7 @@
             <li v-if="ruleForm.proof_type === '2'" class="tupian">
               <div v-if="img_url" class="clearfix">
                 <img
-                  style="width: 102px; height: 102px"
+                  style="width: 74px; height: 74px"
                   :src="img_url"
                   class="avatar fl"
                 />

+ 59 - 103
src/views/purchaseIn/workbench/columns.js

@@ -35,6 +35,13 @@ const options7 = [
   { id: "0", name: "否" },
   { id: "1", name: "是" },
 ]
+//有无工差
+const options8 = [
+  { id: "0", name: "无工差" },
+  { id: "1", name: "有工差" },
+]
+//配置要求
+const options9 = ["证书", "包装盒", "绒布袋", "标签", "其他"]
 const listCol = [
   {
     prop: "cgdNo",
@@ -92,6 +99,27 @@ const listCol = [
     _slot_: "operation",
   },
 ]
+
+const validate_num = (rule, value, callback) => {
+  if (value === "") {
+    callback(new Error("不能为空!"));
+  } else {
+    callback();
+  }
+};
+const validate_num_0 = (rule, value, callback) => {
+  if (value === "") {
+    callback(new Error("不能为空!"));
+  } else if (value === "0" ||
+    value === "0." ||
+    value === "0.0" ||
+    value === "0.00"
+  ) {
+    callback(new Error("不能为零!"));
+  } else {
+    callback();
+  }
+};
 const rules = {
   cat_id: [
     {
@@ -112,38 +140,18 @@ const rules = {
   noble_weight: [
     {
       required: true,
-      message: "贵金属重量为合法数字",
+      validator: validate_num_0,
       trigger: "blur",
     },
   ],
   weight: [
     {
       required: true,
-      message: "商品总重量为合法数字",
+      validator: validate_num_0,
       trigger: "blur",
     },
   ],
-  good_type: [
-    {
-      required: true,
-      message: "请选择是否定制",
-      trigger: "change",
-    },
-  ],
-  is_stock: [
-    {
-      required: true,
-      message: "请选择是否库存品",
-      trigger: "change",
-    },
-  ],
-  company_id: [
-    {
-      required: true,
-      message: "请选择业务公司",
-      trigger: "change",
-    },
-  ],
+
   supplierNo: [
     {
       type: "array",
@@ -181,13 +189,7 @@ const rules = {
       trigger: "blur",
     },
   ],
-  is_exclusive: [
-    {
-      required: true,
-      message: "请选择专属类型",
-      trigger: "change",
-    },
-  ],
+
   noble_metal: [
     {
       required: true,
@@ -202,27 +204,6 @@ const rules = {
       trigger: "change",
     },
   ],
-  moq: [
-    {
-      required: true,
-      message: "定制起订量应为合法数字",
-      trigger: "blur",
-    },
-  ],
-  customized: [
-    {
-      required: true,
-      message: "定制工期为合法数字",
-      trigger: "blur",
-    },
-  ],
-  after_sales: [
-    {
-      required: true,
-      message: "售后说明不能为空",
-      trigger: "blur",
-    },
-  ],
   good_remark: [
     {
       required: true,
@@ -230,43 +211,30 @@ const rules = {
       trigger: "blur",
     },
   ],
-  //包装/发货/图片
-  packing_list: [
+  b1: [
     {
       required: true,
-      message: "请输入包装清单",
-      trigger: "blur",
-    },
-  ],
-  packing_way: [
-    {
-      required: true,
-      message: "请输入包装方式",
+      message: "型号不能为空",
       trigger: "blur",
     },
   ],
 
-  packing_spec: [
+  b2: [
     {
       required: true,
-      message: "请输入装箱规格",
+      message: "颜色不能为空",
       trigger: "blur",
     },
   ],
-  packing_weight: [
+  b3: [
     {
       required: true,
-      message: "请输入装箱重量",
-      trigger: "blur",
-    },
-  ],
-  packing_szie: [
-    {
-      required: true,
-      message: "请输入装箱尺寸",
+      message: "材质不能为空",
       trigger: "blur",
     },
   ],
+
+
   supply_area: [
     {
       required: true,
@@ -274,14 +242,7 @@ const rules = {
       trigger: "change",
     },
   ],
-  delivery_place: [
-    {
-      type: "array",
-      required: true,
-      message: "请选择发货地",
-      trigger: "change",
-    },
-  ],
+
   origin_place: [
     {
       type: "array",
@@ -293,31 +254,32 @@ const rules = {
   delivery_day: [
     {
       required: true,
-      message: "请输入物流时间",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   lead_time: [
     {
       required: true,
-      message: "请输入供货周期",
+      validator: validate_num_0,
       trigger: "blur",
     },
   ],
-  sample_day: [
+  a1: [
     {
       required: true,
-      message: "请输入调样周期",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
-  packing_size: [
+  sample_day: [
     {
       required: true,
-      message: "请输入装箱尺寸",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
+
   good_thumb_img: [
     {
       required: true,
@@ -325,13 +287,7 @@ const rules = {
       trigger: "change",
     },
   ],
-  // good_img: [
-  //   {
-  //     required: true,
-  //     message: "商品详情主图",
-  //     trigger: "change",
-  //   },
-  // ],
+
   good_info_img: [
     {
       type: "array",
@@ -345,63 +301,63 @@ const rules = {
   cert_fee: [
     {
       required: true,
-      message: "证书费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   packing_fee: [
     {
       required: true,
-      message: "包装费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   cost_fee: [
     {
       required: true,
-      message: "成本工艺费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   mark_fee: [
     {
       required: true,
-      message: "加标费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   demo_fee: [
     {
       required: true,
-      message: "打样应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   open_fee: [
     {
       required: true,
-      message: "开模费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   sample_fee: [
     {
       required: true,
-      message: "调样费应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   market_price: [
     {
       required: true,
-      message: "市场价应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
   nake_price: [
     {
       required: true,
-      message: "含税成本合计应为合法数字",
+      validator: validate_num,
       trigger: "blur",
     },
   ],
@@ -411,4 +367,4 @@ const rules = {
     trigger: "change",
   },
 }
-export { options1, options2, options3, options4, options5, options6, options7, listCol, rules }
+export { options1, options2, options3, options4, options5, options6, options7, options8, options9, listCol, rules }

+ 294 - 211
src/views/purchaseIn/workbench/components/baseForm.vue

@@ -23,16 +23,18 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label="信息有效期" prop="lead_time">
-          <el-input
-            placeholder="信息有效期"
-            v-model="ruleForm.lead_time"
-            type="number"
+          <digital-input
+            :values="ruleForm.lead_time"
+            :placeholder="'信息有效期'"
             :min="0"
-            :max="9999999999"
-            :step="0"
-          >
-            <template slot="append">天</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="0"
+            :size="'mini'"
+            :controls="false"
+            :append="'天'"
+            @reschange="number_change($event, 'lead_time')"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="16">
@@ -46,16 +48,18 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label="物流时间" prop="delivery_day">
-          <el-input
-            placeholder="物流时间"
-            v-model="ruleForm.delivery_day"
-            type="number"
+          <digital-input
+            :values="ruleForm.delivery_day"
+            :placeholder="'物流时间'"
             :min="0"
-            :max="9999999999"
-            :step="0"
-          >
-            <template slot="append">天</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="0"
+            :size="'mini'"
+            :controls="false"
+            :append="'天'"
+            @reschange="number_change($event, 'delivery_day')"
+          />
         </el-form-item>
       </el-col>
 
@@ -73,45 +77,34 @@
 
       <el-col :span="8">
         <el-form-item label="产品工期" prop="a1">
-          <el-input
-            placeholder="产品工期"
-            v-model="ruleForm.a1"
-            type="number"
+          <digital-input
+            :values="ruleForm.a1"
+            :placeholder="'产品工期'"
             :min="0"
-            :max="9999999999"
-            :step="0"
-          >
-            <template slot="append">天</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="0"
+            :size="'mini'"
+            :controls="false"
+            :append="'天'"
+            @reschange="number_change($event, 'a1')"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="颜色" prop="b2">
+          <el-input placeholder="颜色" v-model="ruleForm.b2" maxlength="50" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="型号" prop="b1">
+          <el-input placeholder="型号" v-model="ruleForm.b1" maxlength="50" />
         </el-form-item>
       </el-col>
 
       <el-col :span="8">
-        <el-form-item
-          label="商品图片"
-          prop="good_thumb_img"
-          class="activity-upload"
-        >
-          <div class="btnupload" style="position: relative">
-            <img
-              v-if="ruleForm.good_thumb_img"
-              :src="ruleForm.good_thumb_img"
-              class="avatar"
-            />
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            <file-upload
-              class="Upload"
-              :accept="'.jpg,.png,.jpeg'"
-              :multiple="true"
-              :uploadcondition="beforeAvatarUpload"
-              @UploadErrorEvent="UploadErrorEventgood_thumb_img"
-              @UploadSuccessEvent="UploadSuccessEventgood_thumb_img"
-            ></file-upload>
-          </div>
-          <div class="txt-tips fl">
-            <p>图片大小:</p>
-            <p>小于1M</p>
-          </div>
+        <el-form-item label="材质" prop="b3">
+          <el-input placeholder="材质" v-model="ruleForm.b3" maxlength="50" />
         </el-form-item>
       </el-col>
       <el-col :span="8">
@@ -140,16 +133,18 @@
       </el-col>
       <el-col :span="8">
         <el-form-item label="总重量" prop="weight">
-          <el-input
-            placeholder="总重量"
-            v-model="ruleForm.weight"
-            type="number"
+          <digital-input
+            :values="ruleForm.weight"
+            :placeholder="'产品工期'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">g</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'g'"
+            @reschange="number_change($event, 'weight')"
+          />
         </el-form-item>
       </el-col>
 
@@ -194,165 +189,197 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="8">
-        <el-form-item label="颜色" prop="b2">
-          <el-input placeholder="颜色" v-model="ruleForm.b2" maxlength="50">
-            <template slot="append">元</template>
-          </el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="8">
-        <el-form-item label="型号" prop="b1">
-          <el-input placeholder="型号" v-model="ruleForm.b1" maxlength="50">
-            <template slot="append">元</template>
-          </el-input>
-        </el-form-item>
-      </el-col>
 
-      <el-col :span="8">
-        <el-form-item label="材质" prop="b3">
-          <el-input placeholder="材质" v-model="ruleForm.b3" maxlength="50">
-            <template slot="append">元</template>
-          </el-input>
-        </el-form-item>
-      </el-col>
       <el-col :span="8">
         <el-form-item label="证书费" prop="cert_fee">
-          <el-input
-            placeholder="证书费"
-            v-model="ruleForm.cert_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.cert_fee"
+            :placeholder="'证书费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :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="8">
         <el-form-item label="包装费" prop="packing_fee">
-          <el-input
-            placeholder="包装费"
-            v-model="ruleForm.packing_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.packing_fee"
+            :placeholder="'包装费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'packing_fee')"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label="成本工艺费" prop="cost_fee">
-          <el-input
-            placeholder="成本工艺费"
-            v-model="ruleForm.cost_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.pcost_fee"
+            :placeholder="'成本工艺费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :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="8">
         <el-form-item label="加标费" prop="mark_fee">
-          <el-input
-            placeholder="加标费"
-            v-model="ruleForm.mark_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.mark_fee"
+            :placeholder="'加标费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :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="8">
         <el-form-item label="打样费" prop="demo_fee">
-          <el-input
-            placeholder="打样费"
-            v-model="ruleForm.demo_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.demo_fee"
+            :placeholder="'打样费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :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="8">
         <el-form-item label="开模费" prop="open_fee">
-          <el-input
-            placeholder="开模费"
-            v-model="ruleForm.open_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.open_fee"
+            :placeholder="'开模费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :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="8">
         <el-form-item label="调样费" prop="sample_fee">
-          <el-input
-            placeholder="调样费"
-            v-model="ruleForm.sample_fee"
-            type="number"
+          <digital-input
+            :values="ruleForm.sample_fee"
+            :placeholder="'调样费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'sample_fee')"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="市场价" prop="market_price">
-          <el-input
-            placeholder="市场价"
-            v-model="ruleForm.market_price"
-            type="number"
+        <el-form-item label="物流费" prop="market_price">
+          <digital-input
+            :values="ruleForm.market_price"
+            :placeholder="'物流费'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'market_price')"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label="成本合计" prop="nake_price">
-          <el-input
-            placeholder="成本合计"
-            v-model="ruleForm.nake_price"
-            type="number"
+          <digital-input
+            :values="ruleForm.nake_price"
+            :placeholder="'成本合计'"
             :min="0"
-            :max="9999999999.99"
-            :step="2"
-          >
-            <template slot="append">元</template>
-          </el-input>
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'nake_price')"
+          />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item label="采购备注" prop="good_remark">
-          <el-input
-            placeholder="采购备注"
-            maxlength="500"
-            v-model="ruleForm.good_remark"
-          >
-          </el-input>
+
+      <el-col :span="8">
+        <el-form-item
+          label="商品图片(<1mb)"
+          prop="good_thumb_img"
+          class="activity-upload"
+        >
+          <div class="btnupload" style="position: relative">
+            <img
+              v-if="ruleForm.good_thumb_img"
+              :src="ruleForm.good_thumb_img"
+              class="avatar"
+            />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <file-upload
+              class="Upload"
+              :accept="'.jpg,.png,.jpeg'"
+              :multiple="true"
+              :uploadcondition="beforeAvatarUpload"
+              @UploadErrorEvent="UploadErrorEventgood_thumb_img"
+              @UploadSuccessEvent="UploadSuccessEventgood_thumb_img"
+            ></file-upload>
+          </div>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="16">
+        <el-col :span="12">
+          <el-form-item label="付款方式" prop="good_remark">
+            <el-input
+              placeholder="付款方式"
+              maxlength="500"
+              v-model="ruleForm.good_remark"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发货方式" prop="good_remark">
+            <el-input
+              placeholder="发货方式"
+              maxlength="500"
+              v-model="ruleForm.good_remark"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
         <el-form-item label="工艺说明" prop="craft_desc">
           <el-input
             placeholder="工艺说明"
@@ -362,48 +389,99 @@
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="8" v-if="is_noble">
-        <el-form-item label="贵金属重量" prop="noble_weight">
+      <el-col :span="24">
+        <el-form-item label="采购备注" prop="good_remark">
           <el-input
-            placeholder="贵金属重量"
-            v-model="ruleForm.noble_weight"
-            type="number"
-            :min="0"
-            :max="9999999999.99"
-            :step="2"
+            placeholder="采购备注"
+            maxlength="500"
+            v-model="ruleForm.good_remark"
           >
-            <template slot="append">g</template>
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="8" v-if="is_noble">
-        <el-form-item label="贵金属种类" prop="noble_metal">
-          <search-metal-kind
-            :value="ruleForm.noble_metal"
-            :size="'mini'"
-            :isDetail="type !== 'add'"
-            :placeholder="'贵金属种类'"
-            @searchChange="noble_metalsearchChange"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="8" v-if="is_noble">
-        <el-form-item label="启用金价" prop="is_gold_price">
-          <el-select
-            v-model="ruleForm.is_gold_price"
-            filterable
-            clearable
-            style="width: 100%"
-            placeholder="启用金价"
-          >
-            <el-option
-              v-for="group in options5"
-              :key="group.id"
-              :label="group.name"
-              :value="group.id"
+      <el-col :span="24" v-if="is_noble">
+        <el-col :span="8">
+          <el-form-item label="贵金属重量" prop="noble_weight">
+            <digital-input
+              :values="ruleForm.noble_weight"
+              :placeholder="'贵金属重量'"
+              :min="0"
+              :max="100000000000"
+              :position="'right'"
+              :precision="2"
+              :size="'mini'"
+              :controls="false"
+              :append="'g'"
+              @reschange="number_change($event, 'noble_weight')"
             />
-          </el-select>
-        </el-form-item>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="贵金属种类" prop="noble_metal">
+            <search-metal-kind
+              :value="ruleForm.noble_metal"
+              :size="'mini'"
+              :isDetail="type !== 'add'"
+              :placeholder="'贵金属种类'"
+              @searchChange="noble_metalsearchChange"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="启用金价" prop="is_gold_price">
+            <el-select
+              v-model="ruleForm.is_gold_price"
+              filterable
+              clearable
+              style="width: 100%"
+              placeholder="启用金价"
+            >
+              <el-option
+                v-for="group in options5"
+                :key="group.id"
+                :label="group.name"
+                :value="group.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="有无工差" prop="c1">
+            <el-select
+              v-model="ruleForm.c1"
+              filterable
+              clearable
+              style="width: 100%"
+              placeholder="有无工差"
+            >
+              <el-option
+                v-for="group in options8"
+                :key="group.id"
+                :label="group.name"
+                :value="group.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="配置要求" prop="config">
+            <el-select
+              v-model="ruleForm.config"
+              multiple
+              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>
     </el-row>
 
@@ -433,6 +511,7 @@ import {
   options5,
   options6,
   options7,
+  options8,
   rules,
 } from "../columns";
 export default {
@@ -484,6 +563,7 @@ export default {
       options5: options5,
       options6: options6,
       options7: options7,
+      options8: options8,
       ruleForm: {},
       rules: rules,
     };
@@ -513,7 +593,10 @@ export default {
       this.costsitem = sitem;
       this.costshowModel = true;
     },
-
+    number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
@@ -644,7 +727,7 @@ export default {
         noble_metal, //	string	金属类别
         noble_weight, //	string	金属重量
         is_gold_price, //	string	是否使用实时金价
-        market_price, //	string	市场价
+        market_price, //	string	物流费
         nake_price, //	string	成本裸价
         // is_online, //	string	是否上线
         status, //		string	状态

+ 2 - 2
src/views/purchaseIn/workbench/components/packForm.vue

@@ -636,8 +636,8 @@ export default {
 
       li {
         float: left;
-        width: 102px;
-        height: 102px;
+        width: 74px;
+        height: 74px;
         overflow: hidden;
         margin: 0 10px 10px 0;
         border: 1px solid rgb(220, 223, 230);

+ 4 - 27
src/views/purchaseIn/workbench/detail.vue

@@ -53,30 +53,7 @@
             <li>cddv21324</li>
             <li>截止时间:</li>
             <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
-            <li>咨询单号:</li>
-            <li>cddv21324</li>
-            <li>截止时间:</li>
-            <li>2020-09-20 17:00:00</li>
+           
           </ul>
         </div>
       </div>
@@ -161,7 +138,7 @@ export default {
       position: absolute;
       top: 0;
       left: 0;
-      width: 250px;
+      width: 240px;
       height: 100%;
       min-height: 100%;
       overflow-y: scroll;
@@ -171,7 +148,7 @@ export default {
       position: absolute;
       top: 0;
       right: 0;
-      width: calc(100% - 266px);
+      width: calc(100% - 250px);
       height: calc(100% - 150px);
       min-height: calc(100% - 150px);
       overflow-y: scroll;
@@ -183,7 +160,7 @@ export default {
       bottom: 0;
       right: 0;
       background: #fff;
-      width: calc(100% - 266px);
+      width: calc(100% - 250px);
       height: 134px;
       min-height: 134px;
       overflow-y: scroll;

+ 1 - 1
src/views/sellOut/project/components/costFormAddEdit.vue

@@ -89,7 +89,7 @@
             <el-form-item label="商品图片" prop="good_img">
               <div v-if="ruleForm.good_img" class="clearfix">
                 <img
-                  style="width: 102px; height: 102px"
+                  style="width: 74px; height: 74px"
                   :src="ruleForm.good_img"
                   class="avatar fl"
                 />

+ 2 - 2
src/views/serviceParam/supplier/components/baseForm.vue

@@ -751,8 +751,8 @@ export default {
         height: 107px;
         padding: 0 5px 0 0;
         .img-show-li-div {
-          width: 102px;
-          height: 102px;
+          width: 74px;
+          height: 74px;
           border: 1px solid #dfe4ed;
           background: #dfe4ed;
           position: relative;

Неке датотеке нису приказане због велике количине промена