Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/components/base/input-pop/input-pop.vue

@@ -157,7 +157,7 @@ export default {
     // 行数
     areaRows: {
       type: Number,
-      default: 1
+      default: 3
     },
     // 添加tab中使用
     addTabInputFlag: {

src/components/base/select-pop/select-pop.vue

@@ -230,6 +230,7 @@ export default {
       }
     },
     options(n, o) {
+      // console.log('options',n)
       this.optionsData = n;
       // 那么多选超过2个就要开
       if (this.multiple && n && n.length > 2) {

src/locale/lang/zh-CN.js

@@ -733,6 +733,7 @@ export const columns = {
   inboundProcessingFlag:'开单并入库办理标识',
   flgCanPcLogin: '电脑登录',
   flgCanWxLogin:'手机登录',
+  flgBusiness:'业务部门标识',
 }
 
 /**

src/view/fin/other-payable/form.vue

@@ -40,7 +40,7 @@
                             :min="-9999999999"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/other-receivable/form.vue

@@ -46,7 +46,7 @@
                             :min="-9999999999"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/payment/form.vue

@@ -39,7 +39,7 @@
                            :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/receipt/form.vue

@@ -44,7 +44,7 @@
                            :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/ivt/entry-handle/form.vue

@@ -78,7 +78,7 @@
                              type="date" :short-cut-flag="true" />
             </DkFormItem>
             <!--备注-->
-            <DkFormItem prop="remarks" :span="12">
+            <DkFormItem prop="remarks" :span="24">
               <InputPop ref="remarks" v-model="formData.remarks"
                         maxlength=500 textareaFlag/>
             </DkFormItem>

src/view/ivt/ivt-check/form.vue

@@ -31,14 +31,14 @@
                              @ok="staffOk"
                              :multiple="false"/>
           </DkFormItem>
-          <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop v-model="formData.remarks" textareaFlag/>
-          </DkFormItem>
           <!--锁库标识-->
           <DkFormItem prop="flgLock" :label="$t('flgLock')">
             <dk-switch v-model="formData.flgLock"/>
           </DkFormItem>
+          <!--备注-->
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop v-model="formData.remarks" textareaFlag/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--商品信息-->

src/view/ivt/ivt-freeze/form.vue

@@ -53,8 +53,8 @@
             <InputNumberPop ref="sumQuantity" v-model="formData.sumQuantity" :readonly="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop ref="remarks" v-model="formData.remarks" />
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop ref="remarks" v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>

src/view/ivt/ivt-transfer/form.vue

@@ -46,7 +46,7 @@
             <InputPop ref="nonStdCode" v-model="formData.nonStdCode"/>
           </DkFormItem>-->
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>

src/view/ivt/out-handle/form.vue

@@ -77,7 +77,7 @@
                              type="date" :short-cut-flag="true"/>
             </DkFormItem>
             <!--备注-->
-            <DkFormItem prop="remarks" :span="12">
+            <DkFormItem prop="remarks" :span="24">
               <InputPop ref="remarks" v-model="formData.remarks"
                         maxlength=500 textareaFlag/>
             </DkFormItem>

src/view/mst/basic-data/index.vue

@@ -50,7 +50,7 @@
                    :pageFlag="true"
                    :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
                    :height="this.tableHeight-30" primaryKey="brandId" @pageChange="pageSizeChange">
-            <DkTableColumn field="whCode"></DkTableColumn>
+<!--            <DkTableColumn field="whCode"></DkTableColumn>-->
             <DkTableColumn field="whName"></DkTableColumn>
             <DkTableColumn field="supervisor"></DkTableColumn>
             <DkTableColumn field="contactPhone"></DkTableColumn>
@@ -65,7 +65,7 @@
                    :pageFlag="true"
                    :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
                    :height="this.tableHeight" primaryKey="channelId" @pageChange="pageSizeChange">
-            <DkTableColumn field="channelCode"></DkTableColumn>
+<!--            <DkTableColumn field="channelCode"></DkTableColumn>-->
             <DkTableColumn field="channelName"></DkTableColumn>
             <DkTableColumn field="flgDefault" type="switch"></DkTableColumn>
             <DkTableColumn field="flgValid" type="switch"></DkTableColumn>
@@ -121,8 +121,8 @@
         </DkFormItem>
         <!--备注-->
         <DkFormItem prop="remarks">
-          <InputPop ref="remarks" v-model="formData.remarks"
-                    maxlength=500 textareaFlag/>
+          <InputPop ref="remarks" v-model="formData.remarks" :span="12"
+                    maxlength=500 :textarea-flag="true" />
         </DkFormItem>
       </DkForm>
     </DkModal>
@@ -167,10 +167,10 @@ export default {
       },
       searchContent:
         [
-          {
-            itemCode: 'code',
-            itemName: 'goodsAttrCode'
-          },
+          // {
+          //   itemCode: 'code',
+          //   itemName: 'goodsAttrCode'
+          // },
           {
             itemCode: 'name',
             itemName: 'goodsAttrName'
@@ -198,6 +198,7 @@ export default {
      * @date   : 2024/3/9 10:55
      */
     getData(params) {
+      let name = this.$refs['searchCond'].value._value[this.$refs['searchCond'].searchCond[0].valueFormat.code]
       // 商品品牌
       if (this.kindCode == this.$config.kindCode.basicWarehouse || this.kindCode == null) {
         setTimeout(()=>{
@@ -205,9 +206,7 @@ export default {
         },100)
         this.saleChannelTableFlag = false
         this.dictionaryTableFlag = false
-        console.log("this.leftRow:",this.leftRow)
-        params.whCode = this.leftRow.code
-        params.whName = this.leftRow.name
+        params.whName = name
         this.excute(this.$service.wareHouseService, this.$service.wareHouseService.selectByCond, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.wareHouseData = res.data.list
@@ -222,8 +221,7 @@ export default {
         }, 100)
         this.wareHouseTableFlag = false
         this.dictionaryTableFlag = false
-        params.channelCode = this.leftRow.code
-        params.channelName = this.leftRow.name
+        params.channelName = name
         this.excute(this.$service.saleChannelService, this.$service.saleChannelService.selectByCond, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.saleChannelTableData = res.data.list
@@ -233,6 +231,7 @@ export default {
       } else {
         // 数据字典
         params.dictCode = this.kindCode
+        params.dataValue = name
         setTimeout(() => {
           this.dictionaryTableFlag = true
         }, 100)

src/view/mst/customer/form.vue

@@ -74,7 +74,7 @@
           </DkFormItem>
           <!--备注-->
           <DkFormItem prop="remarks" :span="24">
-            <InputPop v-model="formData.remarks"/>
+            <InputPop v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>

src/view/mst/goods-attr/index.vue

@@ -332,7 +332,7 @@ export default {
           this.formData.id = rows[0].brandId
           this.formData.goodsAttrName = rows[0].brandName
           this.formData.shortName = rows[0].shortName
-          this.formData.supplierIds = rows[0].supplierIds
+          this.formData.supplierIds = rows[0].supplierIds === "" ? null : rows[0].supplierIds
           this.formData.supplierName = rows[0].supplierNames
           this.formData.remarks = rows[0].remarks
         }

src/view/mst/goods/form.vue

@@ -48,7 +48,7 @@
             <InputPop ref="skuSpec" v-model="formData.skuSpec"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/mst/org/index.vue

@@ -44,6 +44,7 @@
         <DkTableColumn field="orgCode" ></DkTableColumn>
         <DkTableColumn field="orgMac"></DkTableColumn>
         <DkTableColumn field="whName"></DkTableColumn>
+        <DkTableColumn field="flgBusiness" type="switch" ></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
@@ -93,6 +94,15 @@
                        @ok="moneyAccountOk($event)"
                        :type="this.$config.MagnifierType.moneyAccount"/>
         </DkFormItem>
+        <!--业务部门标识-->
+        <DkFormItem prop="flgBusiness">
+          <template>
+            <i-switch v-model="formData.flgBusiness">
+              <span slot="open"></span>
+              <span slot="close"></span>
+            </i-switch>
+          </template>
+        </DkFormItem>
         <!--备注-->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -114,6 +124,7 @@ export default {
       formData: {
         orgCode: null,
         orgName: null,
+        levelNo: 1,
         parentId: null,
         levelLeaf: null,
         displayNo: null,
@@ -126,6 +137,8 @@ export default {
         macId:null,
         macCode:null,
         macName:null,
+        flgBusiness:false,
+        levelCode:null,
       },
       // 获取topId值
       topId: null,
@@ -135,6 +148,8 @@ export default {
       editTopFlgValid:null,
       // 父级信息
       parentOrgList:[],
+      // =存原始父级数据
+      parentOrgSocial:[],
       // 查询条件
       searchContent: [
         {
@@ -153,24 +168,39 @@ export default {
     detail(id) {
       return this.excuteNoParam(this.$service.orgService, this.$service.orgService.selectById, [id],false)
     },
-
+    /**
+     * @desc   : 加载基础数据
+     * @author : 姜宁
+     * @date   : 2024/7/30 14:21
+     */
+    initData(type){
+      if(!type){
+        this.getUpperOrg();
+      }
+    },
+    /**
+     * @desc   : 获取上级组织机构
+     * @author : 姜宁
+     * @date   : 2024/7/30 14:21
+     */
+    getUpperOrg(){
+      this.excute(this.$service.commonService, this.$service.commonService.getOrg, {}).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.parentOrgList = res.data;
+          this.parentOrgSocial = res.data?.copy();
+          // 赋值TopId
+          this.topId=res.data[0].topId;
+        }
+      })
+    },
     /**
      * @desc   : 查询数据
      * @author : 宋扬
      * @date   : 2024/3/8 15:43
      */
     getData(params) {
-      let excute =  this.excute(this.$service.orgService, this.$service.orgService.selectByCond, params)
-      excute.then(res=>{
-        if (res.code === this.$config.SUCCESS_CODE) {
-         this.parentOrgList=res.data.list;
-         // 赋值TopId
-          this.topId=res.data.list[0].topId;
-        }
-      })
-      return excute
+      return this.excute(this.$service.orgService, this.$service.orgService.selectByCond, params);
     },
-
     /**
      * @desc   : 保存数据
      * @author : 付斌
@@ -183,7 +213,6 @@ export default {
         return this.excute(this.$service.orgService, this.$service.orgService.update, this.params)
       }
     },
-
     /**
      * @desc   : 仓库赋值
      * @author : 宋扬
@@ -209,7 +238,17 @@ export default {
         }
       }
     },
-
+    /**
+     * @desc   : 编辑时获取业务部门下拉数据源
+     * @author : 姜宁
+     * @date   : 2024/7/30 13:50
+     */
+    setValuesByEdit(){
+      this.$nextTick(()=>{
+        this.parentOrgList = this.parentOrgSocial.filter(item=>item.levelCode.indexOf(this.formData.levelCode) === -1)
+        console.log("parentOrgList",this.parentOrgList)
+      })
+    },
     /**
      * @desc   : 资金账户
      * @author : 宋扬
@@ -243,7 +282,9 @@ export default {
      */
     currentChangeEvent({row}) {
       if (row != null) {
-        this.formData.parentId = row.orgId;
+        if (this.modalParams.button === this.$config.formMode.add){
+          this.formData.parentId = row.orgId;
+        }
         // 判断是否是底层数据
         this.flgValid = row.levelLeaf;
         if(row.parentId==null){
@@ -260,6 +301,7 @@ export default {
     this.primaryKey = 'orgId'  // 设置主键Id
     this.routeObjName = 'org'  // 设置路由名称
     this.comHandleEnableFlag = true;
+    this.pageFlag = false
   }
 }
 </script>

src/view/mst/staff/index.vue

@@ -543,7 +543,6 @@ export default {
      * @date   : 2024/3/5 14:19
      */
     saveData() {
-      console.log("this.params:",this.params)
       if (this.modalParams.button === this.$config.formMode.add) {
         delete this.params.staffId // 解决提示主键重复的问题，删除主键代码
         return this.excute(this.$service.staffService, this.$service.staffService.insert, this.params)

src/view/pur/pur-by-sale/index.vue

@@ -53,15 +53,15 @@
           <DkFormItem prop="contactPhone" :label="$t('contactPhone')">
             <InputPop :telephone="true" ref="contactPhone" :readonly="true" v-model="formData.contactPhone"/>
           </DkFormItem>
-          <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop ref="remarks" v-model="formData.remarks"
-                      maxlength=500 textareaFlag/>
-          </DkFormItem>
           <!--开单并入库办理标识-->
           <DkFormItem prop="inboundProcessingFlag" >
             <dkSwitch ref="inboundProcessingFlag" v-model="formData.inboundProcessingFlag"/>
           </DkFormItem>
+          <!--备注-->
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop ref="remarks" v-model="formData.remarks"
+                      maxlength=500 textareaFlag/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--商品信息-->

src/view/pur/pur-enter/form.vue

@@ -73,7 +73,7 @@
                            type="date" :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/pur/pur-order/form.vue

@@ -54,7 +54,7 @@
             <InputPop :telephone="true" ref="contactPhone" :readonly="true" v-model="formData.contactPhone"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>
@@ -335,6 +335,7 @@ export default {
         },
         {
           field: 'remarks',
+
         },
       ],
       warehouseList: [],//仓库

src/view/sale/cus-receipt/form.vue

@@ -39,7 +39,7 @@
             <InputNumberPop ref="receivableBalance" v-model="formData.receivableBalance" :disabled="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order-out/form.vue

@@ -119,7 +119,7 @@
 <!--                           @ok="selectFromNoList"/>-->
 <!--        </DkFormItem>-->
           <!--单据备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order-return/form.vue

@@ -110,7 +110,7 @@
             </template>
           </DkFormItem>
           <!--单据备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks" :readonly="checkColumnIsEdit('remarks')"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order/form.vue

@@ -108,7 +108,7 @@
             <DkSwitch prop="outboundProcessingFlag" v-model="formData.outboundProcessingFlag" :readonly="type === $config.formMode.edit" ref="outboundProcessingFlag"></DkSwitch>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="18">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>