Merge remote-tracking branch 'origin/master'

futian.liu

2023-12-09 5039fb11b2831475ad6d32592b4a4d5a03f0bcfa

 admin-web/src/views/stock/procure/purchaseOrder/index.vue

@@ -10,7 +10,7 @@
          <el-col>
            <!--列表-->
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
              <my-button name="新增"  check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
              <my-button name="导入" @click="importSetting.dialogShow = true" site="tools" size="medium" />
            </div>
            <div v-loading="loading" style="margin-bottom: 15px">
@@ -50,7 +50,7 @@
                          </div>
                        </div>
                        <div class="one-hed">
                          <div class="box"><span class="span-two">机构：</span>{{ item.agencyId }}</div>
                          <div class="box"><span class="span-two">机构：</span>{{ item.agencyName }}</div>
                          <div class="box"><span class="span-two">操作人：</span>{{ item.buyerName }}</div>
                          <div class="box">
                            <span class="span-two">采购时间：</span>{{ item.procureTime | formatTime }}
@@ -151,6 +151,16 @@
        //   defaultValue: '',
        // },
        {
          type: 'cascader',
          dataIndex: 'agencyId',
          label: '机构',
          placeholder: '请选择',
          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
          cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
          defaultValue: '',
          options: [],
        },
        {
          type: 'select',
          dataIndex: 'goodsTemplateId',
          label: '物品名称',
@@ -162,15 +172,6 @@
            value: 'id',
            url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
          },
        },
        {
          type: 'cascader',
          dataIndex: 'agencyId',
          label: '机构',
          placeholder: '请选择',
          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
          defaultValue: '',
          options: [],
        },
        {
          type: 'text',