Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/dv/brandquotation/brandquotationApply.vue

@@ -149,11 +149,12 @@
       </el-table-column>
       <el-table-column
         label="品牌报价名称"
-        width="120"
+        width="180"
         align="center"
         prop="brandQuotationName"
         :show-overflow-tooltip="true"
       />
+            <el-table-column label="金额" width="180" align="center" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
             <el-table-column
         label="品牌名称"
         width="120"
@@ -163,7 +164,7 @@
       />
       <el-table-column
         label="产品名称"
-        width="120"
+        width="180"
         align="center"
         prop="itemName"
         :show-overflow-tooltip="true"

src/views/mes/dv/brandquotation/brandquotationInfo.vue

@@ -43,7 +43,14 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :md="6" :sm="12" :xs="12">
+            <el-form-item label="总金额" prop="amount">
+              <el-input-money 
+              v-model="form.amount" 
+              placeholder="请输入总金额"/>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
             <el-form-item label="品牌" prop="brandCode">
               <el-input v-model="form.brandName" readonly="readonly">
                 <el-button
@@ -58,7 +65,7 @@
               ref="brSelect"
               @onSelected="onBrandSelected"
             ></BrandSelect>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="6">
             <el-form-item label="品牌名称" prop="brandName">
               <el-input v-model="form.brandName" readonly="readonly" />
@@ -100,6 +107,12 @@
             </el-form-item>
           </el-col>
 
+            <el-col :span="8">
+                <el-form-item label="品牌名称" prop="brandName">
+                    <el-input v-model="form.brandName" placeholder="请先将所选产品绑定品牌" disabled/>
+                </el-form-item>
+            </el-col>    
+
           <el-col :md="6" :sm="12" :xs="12">
             <el-form-item label="工艺路线" prop="routeId">
               <el-input
@@ -188,11 +201,12 @@ export default {
         routeId: "",
         routeName: "",
         remark: "",
+        amount: "",
       },
       // 表单校验
       rules: {
         brandId: [
-          { required: true, message: "品牌不能为空", trigger: "blur" }
+          { required: true, message: "品牌不能为空,请先查验所选产品是否已绑定品牌", trigger: "blur" }
         ],             
         }
     };
@@ -273,6 +287,8 @@ export default {
       if (row != undefined && row != null) {
         this.form.itemId = row.itemId;
         this.form.itemName = row.itemName;
+        this.form.brandId = row.brandId;
+        this.form.brandName = row.brandName;
         this.form.unit = row.unitOfMeasure;
       }
     },
@@ -337,6 +353,7 @@ export default {
         routeId: "",
         routeName: "",
         remark: "",
+        amount: "",
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();

src/views/mes/pro/productiorequest/requestApply.vue

@@ -390,7 +390,7 @@
       /** 新增按钮操作 */
       handleAdd(row) {
         // 跳转到申请单界面
-        this.$router.push("/mes/proofing/apply");
+        this.$router.push("/mes/pro/productiorequest/apply");
         return;
         //   this.reset();
         //   this.getTreeselect();

src/views/mes/pro/productiorequest/requestInfoAdd.vue

@@ -89,14 +89,14 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <!-- <el-col :md="8" :xs="12">
             <el-form-item label="仓库" prop="warehouse">
               <el-input
                 v-model="form.warehouse"
                 placeholder="请输入仓库"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :md="8" :xs="12">
             <el-form-item label="尺码" prop="sizeGroup">
               <el-input
@@ -150,14 +150,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :md="8" :xs="12">
+          <!-- <el-col :md="8" :xs="12">
             <el-form-item label="样品" prop="prototype">
               <el-input
                 v-model="form.prototype"
                 placeholder="请选择样品"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <el-col :md="8" :xs="12">

src/views/mes/pro/productiorequest/requestInfoEdit.vue

@@ -86,14 +86,14 @@
               <FactorySelect ref="FactorySelectRef" @onSelected="onFactorySelect" />
             </el-form-item>
           </el-col>
-          <el-col :md="8" :xs="12">
+          <!-- <el-col :md="8" :xs="12">
             <el-form-item label="仓库" prop="warehouse">
               <el-input
                 v-model="form.warehouse"
                 placeholder="请输入仓库"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :md="8" :xs="12">
             <el-form-item label="尺码" prop="sizeGroup">
               <el-input
@@ -158,14 +158,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :md="8" :xs="12">
+          <!-- <el-col :md="8" :xs="12">
             <el-form-item label="样品" prop="prototype">
               <el-input
                 v-model="form.prototype"
                 placeholder="请选择样品"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
 
         <el-row>

src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue

@@ -21,6 +21,7 @@
         size="small"
         :inline="true"
         label-width="8em"
+
        >
         <el-row>
           <el-col :md="8" :xs="12">
@@ -81,8 +82,8 @@
             <el-form-item label="简称" prop="abbreviation">
               <el-input
                 v-model="form.abbreviation"
-                placeholder="请输入简称"
                 disabled
+                :placeholder="mode=='edit' ? '':'请输入简称'"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -90,7 +91,8 @@
             <el-form-item label="样品英文名" prop="enName">
               <el-input
                 v-model="form.enName"
-                placeholder="请输入样品英文名称"
+                readonly
+                :placeholder="mode=='edit' ? '':'请输入样品英文名称'"
                 disabled
               ></el-input>
             </el-form-item>
@@ -99,7 +101,7 @@
             <el-form-item label="样品数量" prop="num">
               <el-input
                 v-model="form.num"
-                placeholder="请输入样品数量"
+                :placeholder="mode=='edit' ? '':'请输入样品数量'"
                 disabled
               >
                 <template slot="suffix">{{ form.unit }}</template>
@@ -110,7 +112,7 @@
             <el-form-item label="打样形式" prop="type">
               <el-input
                 v-model="form.type"
-                placeholder="请选择打样形式"
+                :placeholder="mode=='edit' ? '':'请选择打样形式'"
                 disabled
               ></el-input>
             </el-form-item>
@@ -119,7 +121,7 @@
             <el-form-item label="分配方式" prop="modality">
               <el-input
                 v-model="form.modality"
-                placeholder="请选择分配方式"
+                :placeholder="mode=='edit' ? '':'请选择分配方式'"
                 disabled
               ></el-input>
             </el-form-item>
@@ -128,7 +130,7 @@
             <el-form-item label="表面处理" prop="surfaceTreatment">
               <el-input
                 v-model="form.surfaceTreatment"
-                placeholder="请输入表面处理"
+                :placeholder="mode=='edit' ? '':'请输入表面处理'"
                 disabled
               ></el-input>
             </el-form-item>
@@ -147,7 +149,7 @@
               <el-date-picker
                 value-format="yyyy-MM-dd"
                 v-model="form.plannedFinishDate"
-                placeholder="请输入计划完成日期"
+                :placeholder="mode=='edit' ? '':'请输入计划完成日期'"
                 disabled
               ></el-date-picker>
             </el-form-item>
@@ -157,7 +159,7 @@
               <el-date-picker
                 value-format="yyyy-MM-dd"
                 v-model="form.plannedLayoutDate"
-                placeholder="请输入版面需求时间"
+                :placeholder="mode=='edit' ? '':'请输入版面需求时间'"
                 disabled
               ></el-date-picker>
             </el-form-item>
@@ -166,7 +168,7 @@
             <el-form-item label="测试标准" prop="testStandard">
               <el-input
                 v-model="form.testStandard"
-                placeholder="测试标准"
+                :placeholder="mode=='edit' ? '':'测试标准'"
                 disabled
               ></el-input>
             </el-form-item>