zhanbo.xu

加班修改代码

...@@ -201,6 +201,39 @@ ...@@ -201,6 +201,39 @@
201 ></el-input> 201 ></el-input>
202 </Formitem> 202 </Formitem>
203 </el-col> 203 </el-col>
204 + <!-- 新增 -->
205 + <el-col :span="4">
206 + <Formitem label="第二数量" prop="secondQty">
207 + <el-input
208 + type="number"
209 + class="inputShadow"
210 + id="inputInner--secondQty"
211 + resize="none"
212 + v-model="tableRowformData.secondQty"
213 + clearable
214 + placeholder=""
215 + ></el-input>
216 + </Formitem>
217 + </el-col>
218 + <el-col :span="4">
219 + <Formitem label="第二计量单位" type="edit" prop="unitLegalSecondCode">
220 + <el-input
221 + type="text"
222 + class="inputShadow"
223 + id="inputInner-edit-unitLegalSecondCode"
224 + resize="none"
225 + :disabled="true"
226 + :value="
227 + mapDicDatas(
228 + $store.getters.dict.MEASUREMENT_UNIT,
229 + tableRowformData.unitLegalSecondCode
230 + )
231 + "
232 + ></el-input>
233 + </Formitem>
234 + </el-col>
235 +
236 + <!-- 截止 -->
204 <el-col :span="4"> 237 <el-col :span="4">
205 <Formitem label="币制" prop="currency" type="edit"> 238 <Formitem label="币制" prop="currency" type="edit">
206 <el-select 239 <el-select
...@@ -396,6 +429,10 @@ export default { ...@@ -396,6 +429,10 @@ export default {
396 { required: true, message: "请输入法定数量", trigger: "blur" }, 429 { required: true, message: "请输入法定数量", trigger: "blur" },
397 { validator: checkFractionalPart, trigger: "blur" }, 430 { validator: checkFractionalPart, trigger: "blur" },
398 ], 431 ],
432 + secondQty: [
433 + { required: true, message: "请输入法定数量", trigger: "blur" },
434 + { validator: checkFractionalPart, trigger: "blur" },
435 + ],
399 currency: [ 436 currency: [
400 { required: true, message: "请选择币制", trigger: "change" }, 437 { required: true, message: "请选择币制", trigger: "change" },
401 ], 438 ],
......
...@@ -536,6 +536,14 @@ ...@@ -536,6 +536,14 @@
536 ) 536 )
537 }}</span> 537 }}</span>
538 </template> 538 </template>
539 + <template v-slot:unitLegalSecondCode="scope">
540 + <span>{{
541 + mapDicDatas(
542 + $store.getters.dict.MEASUREMENT_UNIT,
543 + scope.row.unitLegalSecondCode
544 + )
545 + }}</span>
546 + </template>
539 <template v-slot:currency="scope"> 547 <template v-slot:currency="scope">
540 <span>{{ 548 <span>{{
541 mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency) 549 mapCurrencyDatas($store.getters.dict.CURRENCY, scope.row.currency)
...@@ -805,6 +813,19 @@ export default { ...@@ -805,6 +813,19 @@ export default {
805 slot: true, 813 slot: true,
806 }, 814 },
807 { 815 {
816 + name: "第二数量",
817 + value: "secondQty",
818 + width: "",
819 + align: "left",
820 + },
821 + {
822 + name: "第二计量单位",
823 + value: "unitLegalSecondCode",
824 + width: "",
825 + align: "left",
826 + slot: true,
827 + },
828 + {
808 name: "币制", 829 name: "币制",
809 value: "currency", 830 value: "currency",
810 width: "", 831 width: "",
...@@ -986,6 +1007,7 @@ export default { ...@@ -986,6 +1007,7 @@ export default {
986 enterpriseProductDescribe: "", 1007 enterpriseProductDescribe: "",
987 enterpriseProductName: "", 1008 enterpriseProductName: "",
988 legalQty: 0, 1009 legalQty: 0,
1010 + secondQty: 0,
989 model: "", 1011 model: "",
990 netWeight: 0, 1012 netWeight: 0,
991 price: 0, 1013 price: 0,
......