Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/order/order-add-or-update.vue

@@ -200,7 +200,7 @@
           </el-row>
         </el-row>
         <el-row class="my-row">
-          <div class="title"><span style="color: red">*</span> 任务工单派发</div>
+          <div class="title">任务工单派发</div>
           <el-table
             :data="workInfoDetails"
             border
@@ -470,9 +470,6 @@ export default {
             let pList2 = this.workInfoDetails
             if (pList2.length > 0) {
               this.dataForm.workInfoList = pList2
-            } else {
-              this.$message.error('请添加任务工单派发')
-              return
             }
             this.$http({
               url: !this.id

src/views/modules/order/order.vue

@@ -1,4 +1,4 @@
-<!-- 任务单 -->
+<!-- 任务单列表 -->
 <template>
   <div class="order">
     <template v-if="!addOrUpdateVisible && !detailVisible && !arrivedVisible && !confirmVisible && !noticeChangeAttachVisible && !amountMaskSettingVisible">

src/views/modules/product/template-add-or-update.vue

@@ -94,8 +94,7 @@
         dataRule: {
           productName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }],
           productSpecifications: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
-          cnt: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-          price: [{ required: true, message: '含税单价不能为空', trigger: 'blur' }]
+          cnt: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
         }
       }
     },

src/views/modules/sale/purchase.vue

@@ -379,7 +379,7 @@
       addOrUpdateHandle (id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id, this.optionsType)
+          this.$refs.addOrUpdate.init(id)
         })
       },
       // 转换属性“类别”

src/views/modules/sale/supplier-detail.vue

@@ -26,7 +26,7 @@
       </div>
       <e-desc title="基本信息" column="3">
         <e-desc-item label="公司名称">{{dataForm.supplierName}}</e-desc-item>
-        <e-desc-item label="供应商级别">{{dataForm.level}}</e-desc-item>
+        <e-desc-item label="供应商级别">{{dataForm.levelName}}</e-desc-item>
         <e-desc-item label="详细地址">{{dataForm.addrDetail}}</e-desc-item>
 
         <e-desc-item label="邮编">{{dataForm.zipCode}}</e-desc-item>

src/views/modules/sale/supplier.vue

@@ -44,7 +44,7 @@
           label="供应商名称">
         </el-table-column>
         <el-table-column
-          prop="level"
+          prop="levelName"
           header-align="center"
           align="center"
           label="级别">

src/views/modules/tech/ctafts-add-or-detail.vue

@@ -203,7 +203,7 @@ export default {
       this.isEdit = isEdit && !isCopy
       this.isCopy = isCopy
 
-      await getProduct({ current: 1, size: 20000 }).then(({ data }) => {
+      await getProduct({ current: 1, size: 50 }).then(({ data }) => {
         if (data && data.code === '200') {
           this.optionLevel = data.data.records
           this.optionLevel.forEach(item => {

src/views/modules/warehouse/stock-order-inbound.vue

@@ -103,7 +103,7 @@
             <el-row class="my-row">
               <el-col :span="8">
                 <el-form-item label="单价" prop="price">
-                  <el-input-number v-model="item.price" :disabled="display" :precision="1" :min="0.0" :step="0.1"></el-input-number>
+                  <el-input-number v-model="item.price" :disabled="display" :precision="2" :min="0.00" :step="0.10"></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="8" style="padding-left: 20px">
@@ -113,7 +113,7 @@
               </el-col>
               <el-col :span="8" style="padding-left: 20px">
                 <el-form-item label="金额" prop="amount">
-                  <span>{{ item.price * item.cnt }}</span>
+                  <span>{{ Number(item.price * item.cnt) }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -226,9 +226,11 @@
       addOne (item) {
         this.dataList.push({...item,
           buttonType: item ? (item.buttonType ? '1' : '0') : '0',
+          price: (item && item.price) ? item.price : 0,
+          cnt: (item && item.cnt) ? item.cnt : 0,
           amount: item ? item.amount : 0,
           state: item ? item.state : 0,
-          sourceCategory: item ? item.sourceCategory : '2',
+          sourceCategory: (item && item.sourceCategory) ? item.sourceCategory : '2',
           expirationTime: item ? (item.expirationTime ? item.expirationTime : '2099-01-01 00:00:00') : '2099-01-01 00:00:00'
         })
       },