imeik-bizui 0.3.0 → 0.3.2

package/dist/bizui/src/FieldApplyTypeView/index.vue

@@ -37,7 +37,6 @@ export default {
   },
   data() {
     return {
-      isView: false,
       formConfig: {
         column: 4,
         gutter: 24,
@@ -53,6 +52,9 @@ export default {
     }
   },
   computed: {
+    isView() {
+      return !!this.attrs.isView
+    },
     belongCompany() {
       return this.formProps.applicationApplyCustomer?.invoiceCompanyCode || ''
     },
@@ -82,6 +84,12 @@ export default {
     }
   },
   watch: {
+    value: {
+      handler(val) {
+        this.formConfig.props = val
+      },
+      immediate: true
+    },
     formItems: {
       handler(val) {
         this.formConfig.formItems = val

package/dist/bizui/src/FieldBatchesDelivery/components/MaterialList.vue

@@ -16,21 +16,21 @@
         <p class="materialSubName">包装规格：{{ row.materialSpecification }}</p>
         <p class="materialSubName">计量单位：{{ row.materialUnit }}</p>
       </template>
-      <template slot="useCount" slot-scope="{ row }">
-        <p v-if="isView">{{ row.useCount }}</p>
+      <template slot="deliveryQuantity" slot-scope="{ row }">
+        <p v-if="isView">{{ row.deliveryQuantity }}</p>
         <div v-else>
-          <el-input v-model="row.useCount" :class="{ error: row.quantityError }" placeholder="请输入" @input="handleInput(row)"></el-input>
+          <el-input v-model="row.deliveryQuantity" :class="{ error: row.quantityError }" placeholder="请输入" @input="handleInput(row)"></el-input>
           <p v-if="row.quantityError" class="materialSubName" style="margin-top: 10px; color: red">发货数量不能大于剩余发货数量</p>
           <p class="materialSubName" style="margin-top: 10px">剩余发货数量：{{ row.currentSurplusQuantity }}盒</p>
         </div>
       </template>
-      <template slot="materialQuantityTime" slot-scope="{ row }">
-        <p v-if="isView">{{ row.materialQuantityTime }}</p>
-        <el-date-picker v-else v-model="row.materialQuantityTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"> </el-date-picker>
+      <template slot="planDeliveryTime" slot-scope="{ row }">
+        <p v-if="isView">{{ row.planDeliveryTime }}</p>
+        <el-date-picker v-else v-model="row.planDeliveryTime" :picker-options="pickerOptionsHandle" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"> </el-date-picker>
       </template>
-      <template slot="remarks" slot-scope="{ row }">
-        <el-input v-if="!isView" v-model="row.remarks" type="textarea" :rows="5" show-word-limit maxlength="100" placeholder="请输入"></el-input>
-        <div v-else>{{ row.remarks || '-' }}</div>
+      <template slot="remark" slot-scope="{ row }">
+        <el-input v-if="!isView" v-model="row.remark" type="textarea" :rows="5" show-word-limit maxlength="100" placeholder="请输入"></el-input>
+        <div v-else>{{ row.remark || '-' }}</div>
       </template>
     </ImTable>
   </div>
@@ -87,33 +87,38 @@ export default {
             }
           },
           {
-            prop: 'useCount',
+            prop: 'deliveryQuantity',
             label: '发货数量',
             type: 'slot',
-            slot: 'useCount',
+            slot: 'deliveryQuantity',
             attrs: {
               'min-width': '180'
             }
           },
           {
-            prop: 'materialQuantityTime',
+            prop: 'planDeliveryTime',
             label: '发货时间',
             type: 'slot',
-            slot: 'materialQuantityTime',
+            slot: 'planDeliveryTime',
             attrs: {
               'min-width': '240'
             }
           },
           {
-            prop: 'remarks',
+            prop: 'remark',
             label: '备注',
             type: 'slot',
-            slot: 'remarks',
+            slot: 'remark',
             attrs: {
               'min-width': '160'
             }
           }
-        ]
+        ],
+        pickerOptionsHandle: {
+          disabledDate(time) {
+            return time.getTime() < Date.now() - 8.64e7
+          }
+        }
       }
     }
   },
@@ -140,7 +145,7 @@ export default {
           item.currentSurplusQuantity = Number(item.currentQuantityCount)
           allSelectData.forEach((item2) => {
             if (item.productCode === item2.productCode) {
-              item.currentQuantityCount = (item.currentQuantityCount || Number(item.materialQuantity)) - Number(item2.useCount)
+              item.currentQuantityCount = (item.currentQuantityCount || Number(item.materialQuantity)) - Number(item2.deliveryQuantity)
               item.currentSurplusQuantity = Number(item.currentQuantityCount)
             }
           })
@@ -160,7 +165,7 @@ export default {
     },
     handleInput(row) {
       // 过滤掉非数字字符，并确保是正整数
-      row.useCount = row.useCount.replace(/^(0+)|[^\d]+/g, '')
+      row.deliveryQuantity = row.deliveryQuantity.replace(/^(0+)|[^\d]+/g, '')
       this.setSurplusQuantityNumber(row)
     },
     // 设置剩余数量
@@ -168,7 +173,7 @@ export default {
       // currentQuantityCount 是分批之后当前物料实际剩余量数据
       const currentCount = row.currentQuantityCount
       // 再次计算剩余量
-      const surplusQuantity = currentCount - Number(row.useCount)
+      const surplusQuantity = currentCount - Number(row.deliveryQuantity)
       if (surplusQuantity < 0) {
         row.currentSurplusQuantity = currentCount
         row.quantityError = true
@@ -186,11 +191,11 @@ export default {
           return null
         }
         data.forEach((item, index) => {
-          if (item.useCount && item.materialQuantityTime && !item.quantityError) {
+          if (item.deliveryQuantity && item.planDeliveryTime && !item.quantityError) {
             // 清空已经要入组的数据
-            this.tableConfig.data[index].useCount = ''
-            this.tableConfig.data[index].remarks = ''
-            this.tableConfig.data[index].materialQuantityTime = ''
+            this.tableConfig.data[index].deliveryQuantity = ''
+            this.tableConfig.data[index].remark = ''
+            this.tableConfig.data[index].planDeliveryTime = ''
             this.tableConfig.data[index].currentQuantityCount = item.currentSurplusQuantity
             reslut.push(item)
           }
@@ -207,7 +212,7 @@ export default {
       this.tableConfig.data.forEach((item, index) => {
         recordData.forEach((record) => {
           if (item.productCode === record.productCode) {
-            item.currentQuantityCount = Number(item.currentQuantityCount) + Number(record.useCount)
+            item.currentQuantityCount = Number(item.currentQuantityCount) + Number(record.deliveryQuantity)
             item.currentSurplusQuantity = item.currentQuantityCount
             this.$set(this.tableConfig.data, index, { ...item })
           }

package/dist/bizui/src/FieldBatchesDelivery/index.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="page-view">
     <div>
-      <span>发货时效性：</span>
-      <el-radio v-model="radio" label="1">整单立即发货</el-radio>
-      <el-radio v-model="radio" label="2">分批延迟发货</el-radio>
-      <el-button v-show="showButotn" type="primary" @click="showBatchDialog">分批发货</el-button>
+      <p class="page-view-title"><span class="start">*</span>发货时效性：</p>
+      <div style="margin-top: 17px">
+        <el-radio v-model="materialSendType" label="1">整单立即发货</el-radio>
+        <el-radio v-model="materialSendType" label="2">分批延迟发货</el-radio>
+        <el-button v-show="showButotn" class="button-view" type="primary" @click="showBatchDialog">分批发货</el-button>
+      </div>
     </div>
     <OrderList v-if="showOrderList" :table-data="selectOrderList" :is-view="false" @removeSubOrder="removeSubOrder"></OrderList>
     <BatchDialog :show.sync="showDialog" :selected-data="selectOrderList" @onConfirm="onConfirm"></BatchDialog>
@@ -27,7 +29,7 @@ export default {
   },
   data() {
     return {
-      radio: '1',
+      materialSendType: '1',
       showDialog: false,
       selectOrderList: []
     }
@@ -35,15 +37,30 @@ export default {
   computed: {
     showButotn() {
       const hasMaterial = this.formProps.applicationApplyMaterial?.length
-      const hasMaterialQuantity = this.formProps.applicationApplyMaterial?.every(
-        item => item.materialQuantity
-      )
-      return this.radio === '2' && hasMaterial && hasMaterialQuantity
+      const hasMaterialQuantity = this.formProps.applicationApplyMaterial?.every((item) => item.materialQuantity)
+      return this.materialSendType === '2' && hasMaterial && hasMaterialQuantity
     },
     showOrderList() {
       return this.selectOrderList && this.selectOrderList.length > 0
     }
   },
+  watch: {
+    materialSendType: {
+      handler(val) {
+        val && this.onUpdate()
+      },
+      immediate: true
+    },
+    selectOrderList: {
+      handler(val) {
+        if (val && val.length) {
+          this.onUpdate()
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   mounted() {},
   methods: {
     showBatchDialog() {
@@ -55,8 +72,29 @@ export default {
     },
     removeSubOrder(data, index) {
       this.selectOrderList.splice(index, 1)
+    },
+    onUpdate() {
+      this.$emit('input', { materialSendType: this.materialSendType, orderList: this.selectOrderList })
     }
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.page-view-title {
+  font-size: 14px;
+  color: #333333;
+  line-height: 16px;
+  .start {
+    font-size: 14px;
+    color: #e02020;
+    line-height: 16px;
+    margin-right: 10px;
+  }
+}
+.page-view {
+  margin-top: 20px;
+}
+.button-view {
+  display: inline-block;
+}
+</style>

package/dist/bizui/src/FieldContentDescription/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="page-view">
-    <!-- <p class="mb-1">申请内容说明</p> -->
-    <FieldInput v-model="descript" :attrs="attrs"></FieldInput>
+    <FieldInput v-model="descript" :attrs="{ ...myAttrs, isView }"></FieldInput>
   </div>
 </template>
 
@@ -13,46 +12,66 @@ export default {
       default: () => {}
     }
   },
+  props: {
+    value: {
+      type: String,
+      default: ''
+    },
+    attrs: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
   data() {
     return {
       descript: '',
-      attrs: {
+      myAttrs: {
         type: 'textarea',
         rows: 4,
         bottomText: ''
       }
     }
   },
+  computed: {
+    isView() {
+      return !!this.attrs.isView
+    }
+  },
   watch: {
-    formProps: {
+    'formProps.applyTypeInfo.applyType': {
       handler(val) {
-        this.setBottomText()
+        val && this.setBottomText()
       },
       immediate: true,
       deep: true
+    },
+    value: {
+      handler(val) {
+        this.descript = val
+      },
+      immediate: true
     }
   },
   mounted() {
-    console.log(this.formProps, 'formProps')
+    console.log(this.formProps, 'formProps111222')
   },
   methods: {
     setBottomText() {
-      console.log(this.formProps, 'this.formProps')
-      if (this.formProps?.applyType?.applyType === 1) {
-        this.attrs.bottomText = '①术前照片要求与此申请一起提交，术后照片及反馈资料要求注射后一周内发给商务助理；②提供医生签字或者机构盖章的上市后临床研究协议的电子版照片；③纸质版协议寄回给商务助理。'
-      }
-      if (this.formProps?.applyType?.applyType === 2) {
-        this.attrs.bottomText = '①提供医生签字或者机构盖章的合作意向书/技术服务合同，需总经理签字；②若需要机构伦理委员会审批提供审批结果；③研究周期及预期成果需注明资料反馈时间。'
-      }
-      if (this.formProps?.applyType?.applyType === 3) {
-        this.attrs.bottomText = '①提供机构盖章的合作协议或技术服务合同；②若需要机构伦理委员会审批提供审批结果。'
+      const applyType = this.formProps?.applyTypeInfo?.applyType
+      if (!applyType) {
+        return
       }
-      if (this.formProps?.applyType?.applyType === 4) {
-        this.attrs.bottomText = '①提供医生签字或者机构盖章的合作意向书或技术服务合同；②若需要机构伦理委员会审批提供审批结果。'
+      const bottomTextMap = {
+        1: '①术前照片要求与此申请一起提交，术后照片及反馈资料要求注射后一周内发给商务助理；②提供医生签字或者机构盖章的上市后临床研究协议的电子版照片；③纸质版协议寄回给商务助理。',
+        2: '①提供医生签字或者机构盖章的合作意向书/技术服务合同，需总经理签字；②若需要机构伦理委员会审批提供审批结果；③研究周期及预期成果需注明资料反馈时间。',
+        3: '①提供机构盖章的合作协议或技术服务合同；②若需要机构伦理委员会审批提供审批结果。',
+        4: '①提供医生签字或者机构盖章的合作意向书或技术服务合同；②若需要机构伦理委员会审批提供审批结果。'
       }
+      this.myAttrs.bottomText = bottomTextMap[applyType] || ''
     }
   }
 }
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

package/dist/bizui/src/FieldMaterialSelect/components/ProductList.vue

@@ -79,7 +79,7 @@
         <p v-if="row.materialReceivingAddressType" class="address-info">收货类型：{{ formatData(row.materialReceivingAddressType, 'materialReceivingAddressType') }}</p>
         <p class="address-info">地址信息：{{ row.materialReceivingContact }} {{ row.materialReceivingContactNumber }}</p>
         <p class="address-info">收货地址：{{ row.materialReceivingAddress }}</p>
-        <p class="address" @click="changeAddressInfo(row, $index)">修改收货地址</p>
+        <p v-if="!isView" class="address" @click="changeAddressInfo(row, $index)">修改收货地址</p>
       </template>
       <template slot="operate" slot-scope="{ row, $index }">
         <el-button class="delete-button" type="text" @click="deleteProduct(row, $index)">移除</el-button>
@@ -277,7 +277,6 @@ export default {
     }
   },
   mounted() {
-    this.tableConfig.data = []
   },
   methods: {
     getMaterialOtherData() {

package/dist/bizui/src/FieldMaterialSelect/index.vue

@@ -5,12 +5,12 @@
         <div class="title-line"></div>
         <p class="title">产品信息</p>
       </div>
-      <el-button type="primary" class="add-button" @click="showProductListSelect">
+      <el-button v-if="!isView" type="primary" class="add-button" @click="showProductListSelect">
         <i class="el-icon-plus"></i>
         添加
       </el-button>
     </div>
-    <ProductList :table-data="tableData" :table-item-arr="tableItemArr" @removeItem="onRemoveItem"></ProductList>
+    <ProductList :table-data="tableData" :is-view="isView" :table-item-arr="tableItemArr" @removeItem="onRemoveItem"></ProductList>
     <SelectProductDialog ref="selectProductDialog" @addProduct="addProduct"></SelectProductDialog>
   </div>
 </template>
@@ -36,10 +36,6 @@ export default {
         return []
       }
     },
-    isView: {
-      type: Boolean,
-      default: false
-    },
     attrs: {
       type: Object,
       default() {
@@ -51,7 +47,7 @@ export default {
     return {
       tableData: [],
       tableItemArr: [], // 总列数组
-      baseInfo: ['materialBasicsInfo', 'materialCountInfo', 'operate'], // 基础列
+      baseInfo: ['materialBasicsInfo', 'materialCountInfo'], // 基础列
       budget: ['materialBudgetInfo'], // 预算列
       scheme: ['materialSchemeInfo'], // 母方案列
       batch: ['materialBatchInfo'], // 批次列
@@ -60,7 +56,19 @@ export default {
       showAddButton: false
     }
   },
+  computed: {
+    isView() {
+      return !!this.attrs.isView
+    }
+  },
   watch: {
+    value: {
+      handler(val) {
+        this.tableData = val
+      },
+      deep: true,
+      immediate: true
+    }
   },
   created() {
     this.handleTableData()
@@ -78,6 +86,10 @@ export default {
       this.attrs.materialConfig?.forEach(item => {
         this.tableItemArr = this.tableItemArr.concat(allData[item])
       })
+      // 不是查看就添加操作列
+      if (!this.isView) {
+        this.tableItemArr.push('operate')
+      }
     },
     showProductListSelect() {
       this.$refs.selectProductDialog.show()

package/dist/bizui/src/FieldTagComponent/index.vue

@@ -124,7 +124,8 @@ export default {
         showAllLevels: false,
         multiple: this.isMultiple,
         serverUrl: this.tagValueUrl,
-        optionFilterValues: this.optionFilterValues
+        optionFilterValues: this.optionFilterValues,
+        isView: this.attrs?.isView
       }
     }
   },

package/dist/bizui/utils/requestTemplate.js

@@ -12,6 +12,12 @@ export function getService(baseUrlMap) {
     (config) => {
       // 需要在请求的时候再获取环境变量，因为js加载立即执行会导致$bizui中没有值
       const $bizui = Vue.prototype.$bizui
+      // const $bizui = {
+      //   env: 'testenv',
+      //   userTokenFunc: () => {
+      //     return 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMzEyMTg4OTk1MyIsImF1ZCI6ImFkbWluIiwiY3JlYXRlZCI6MTc0MTYxOTE5MTc5NiwiZW1wbG95ZWVDb2RlIjoxNzQxNjE5MTkxNzk2fQ.4tRoat0n_iVwgylaMqkVcEL_T7LB6BkPUMbEzcRFiivmj2La4rgQMob5jja-NjI4ZFSz6A2YIps36528LbfW2w'
+      //   }
+      // }
       config.baseURL = config.isTag ? '' : baseUrlMap[$bizui.env]
       // 将获取token的方法传入，防止初始化的时候token为空
       if ($bizui.userTokenFunc && typeof $bizui.userTokenFunc === 'function') {