供应商修改

src/views/purchase/supplier/Supplier.vue

@@ -20,6 +20,7 @@
       </div>
 
       <div class="table-operator">
+        <a-button v-if="$auth('purchase-suppliers-add')" type="primary" icon="plus" @click="handleAdd()">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('purchase-suppliers-export')" type="primary" icon="download" @click="doExport">导出</a-button>
       </div>
 
@@ -44,14 +45,21 @@
 <!--            <operation-button-->
 <!--              :type="1"-->
 <!--              @click="handleGoodsList(record.id)">供货清单</operation-button>-->
-            <operation-button
-              :type="1"
-              @click="handleGoodsRecord(record.id)">供货记录</operation-button>
+<!--            <operation-button-->
+<!--              :type="1"-->
+<!--              @click="handleGoodsRecord(record.id)">供货记录</operation-button>-->
           </template>
         </span>
       </s-table>
 
     </div>
+    <apply-form
+      ref="baseApplyModal"
+      @ok="handleOk"
+      :supplyTypeMap="supplyTypeMap"
+      :typeMap="typeMap"
+      :statusMap="statusMap"
+      :natureMap="natureMap"/>
     <base-form
       ref="baseModal"
       @ok="handleOk"
@@ -84,6 +92,7 @@
 import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import AuditForm from './modules/AuditForm'
+import ApplyForm from './modules/ApplyForm'
 import SupplierGoodsList from './SupplierGoodsList'
 import SupplierGoodsRecord from './SupplierGoodsRecord'
 import Detail from './modules/Detail'
@@ -95,6 +104,7 @@ export default {
     STable,
     Ellipsis,
     BaseForm,
+    ApplyForm,
     AuditForm,
     SupplierGoodsList,
     SupplierGoodsRecord,
@@ -122,12 +132,12 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '账号',
-          dataIndex: 'account',
-          checked: true,
-          width: 100
-        },
+        // {
+        //   title: '账号',
+        //   dataIndex: 'account',
+        //   checked: true,
+        //   width: 100
+        // },
         {
           title: '名称',
           dataIndex: 'name',
@@ -195,16 +205,16 @@ export default {
           checked: true,
           width: 150
         },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          width: 120,
-          checked: true,
-          customRender: (text, record, index) => {
-            return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
-              this.DictCache.COLOR.SUPPLIER_STATUS, this.statusMap)
-          }
-        },
+        // {
+        //   title: '状态',
+        //   dataIndex: 'status',
+        //   width: 120,
+        //   checked: true,
+        //   customRender: (text, record, index) => {
+        //     return this.BaseTool.Table.statusCustomRenderDict(this, text, record,
+        //       this.DictCache.COLOR.SUPPLIER_STATUS, this.statusMap)
+        //   }
+        // },
         {
           title: '申请时间',
           checked: true,
@@ -286,7 +296,7 @@ export default {
     },
     handleAdd () {
       this.visible = false
-      this.$refs.baseModal.base()
+      this.$refs.baseApplyModal.base()
     },
     batchDelete (id) {
       let ids = []

src/views/purchase/supplier/modules/ApplyForm.vue

@@ -3,9 +3,9 @@
     <a-row :gutter="48" slot="extra">
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right">
-          <a-popconfirm title="提交审批操作过后将无法更改，确认进行该操作吗？" @confirm="save(1)">
-            <a-button type="danger">提交审批</a-button>
-          </a-popconfirm>
+          <!--          <a-popconfirm title="提交审批操作过后将无法更改，确认进行该操作吗？" @confirm="save(1)">-->
+          <!--            <a-button type="danger">提交审批</a-button>-->
+          <!--          </a-popconfirm>-->
           <a-button style="margin-left: 8px" type="primary" @click="save()">保存</a-button>
           <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
         </span>
@@ -20,21 +20,6 @@
       <a-row class="form-row" :gutter="16">
         <a-col :lg="7" :md="12" :sm="24">
 
-          <a-form-item
-            label="国家"
-          >
-            <a-select v-decorator="['country', {rules: [{required: true, message: '国家不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in countryMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="名称"
           >
@@ -43,7 +28,6 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="类型"
           >
@@ -57,10 +41,9 @@
               </a-select-option>
             </a-select>
           </a-form-item>
+
         </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="单位性质"
           >
@@ -73,9 +56,11 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
 
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="单位法人"
           >
@@ -84,7 +69,6 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="联系方式"
           >
@@ -92,11 +76,9 @@
               v-decorator="['phone', {rules: [{ required: true, message: '请输入联系方式' }]} ]">
             </a-input>
           </a-form-item>
-        </a-col>
-      </a-row>
 
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
+        </a-col>
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="联系人"
           >
@@ -104,9 +86,12 @@
               v-decorator="['contactPerson', {rules: [{required: true, message: '联系人不能为空'}]}]">
             </a-input>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="注册资本"
           >
@@ -117,28 +102,6 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
-          <a-form-item
-            label="供货区域"
-          >
-            <a-tree
-              checkable
-              @expand="onExpand"
-              :expandedKeys="expandedKeys"
-              :autoExpandParent="autoExpandParent"
-              v-model="checkedKeys"
-              @check="onCheck"
-              @select="onSelect"
-              :check-strictly="true"
-              :selectedKeys="selectedKeys"
-              :treeData="depts"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="送达地址"
           >
@@ -146,18 +109,36 @@
               v-decorator="['arriveAddress']">
             </a-input>
           </a-form-item>
+
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="税号"
           >
             <a-input
               v-decorator="['taxNo']"/>
           </a-form-item>
+          <!--          <a-form-item-->
+          <!--            label="供货区域"-->
+          <!--          >-->
+          <!--            <a-tree-->
+          <!--              checkable-->
+          <!--              @expand="onExpand"-->
+          <!--              :expandedKeys="expandedKeys"-->
+          <!--              :autoExpandParent="autoExpandParent"-->
+          <!--              v-model="checkedKeys"-->
+          <!--              @check="onCheck"-->
+          <!--              @select="onSelect"-->
+          <!--              :check-strictly="true"-->
+          <!--              :selectedKeys="selectedKeys"-->
+          <!--              :treeData="depts"-->
+          <!--            />-->
+          <!--          </a-form-item>-->
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="开户行"
           >
@@ -165,10 +146,7 @@
               v-decorator="['bankName']"/>
           </a-form-item>
         </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="银行账号"
           >
@@ -176,6 +154,7 @@
               v-decorator="['bankNo']">
             </a-input>
           </a-form-item>
+
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
@@ -185,9 +164,12 @@
               v-decorator="['agent']">
             </a-input>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="供货类别"
           >
@@ -201,11 +183,7 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
-
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="授权书"
           >
@@ -214,53 +192,56 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="邮箱"
           >
             <a-input
-              v-decorator="['email', {rules: [{ required: true, message: '请输入正确的邮箱', pattern: /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/ }], validateTrigger: ['change', 'blur']}]"/>
+              v-decorator="['email', {rules: [{ message: '请输入正确的邮箱', pattern: /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/ }], validateTrigger: ['change', 'blur']}]"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="QQ"
           >
             <a-input
               v-decorator="['qq']"/>
           </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
 
+        </a-col>
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="微信"
           >
             <a-input
               v-decorator="['wechat']"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 15, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="注册地址"
           >
             <a-input
               v-decorator="['registerAddress']"/>
           </a-form-item>
+
         </a-col>
       </a-row>
       <a-row class="form-row" :gutter="16">
-        <a-col :lg="11" :md="24" :sm="24">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="供货品牌"
           >
             <a-textarea
               v-decorator="['supplyBrand']"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 11, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
+        <a-col :xl="{span: 15, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="主营业务"
           >
@@ -440,7 +421,8 @@ export default {
         values.imgUrls = this.imgUrls.join(',')
         values.supplyType = values.supplyType.join(',')
         console.log(this.checkedKeys.checked)
-        values.deptIds = this.checkedKeys.checked.join(',')
+        const ids = this.checkedKeys.checked
+        values.deptIds = ids ? ids.join(',') : ''
         values.submitType = value
         if (this.BaseTool.String.isBlank(values.id)) {
           addSupplier(values)

src/views/purchase/supplier/modules/BaseForm.vue

@@ -17,16 +17,6 @@
       <a-row class="form-row" :gutter="16">
         <a-col :lg="7" :md="12" :sm="24">
 
-          <a-form-item
-            label="账号"
-          >
-            <a-input
-              disabled="disabled"
-              v-decorator="['account', {rules: [{required: true, message: '账号不能为空'}]}]"/>
-          </a-form-item>
-        </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="名称"
           >
@@ -50,9 +40,7 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="单位性质"
           >
@@ -65,9 +53,11 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
 
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="单位法人"
           >
@@ -76,7 +66,6 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="联系方式"
           >
@@ -84,11 +73,10 @@
               v-decorator="['phone', {rules: [{ required: true, message: '请输入联系方式' }]} ]">
             </a-input>
           </a-form-item>
+
         </a-col>
-      </a-row>
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
 
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="联系人"
           >
@@ -97,8 +85,10 @@
             </a-input>
           </a-form-item>
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="注册资本"
           >
@@ -110,27 +100,6 @@
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
 
-          <a-form-item
-            label="供货区域"
-          >
-            <a-tree
-              checkable
-              @expand="onExpand"
-              :expandedKeys="expandedKeys"
-              :autoExpandParent="autoExpandParent"
-              v-model="checkedKeys"
-              @check="onCheck"
-              @select="onSelect"
-              :check-strictly="true"
-              :selectedKeys="selectedKeys"
-              :treeData="depts"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="送达地址"
           >
@@ -140,16 +109,18 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="税号"
           >
             <a-input
               v-decorator="['taxNo']"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="开户行"
           >
@@ -157,10 +128,7 @@
               v-decorator="['bankName']"/>
           </a-form-item>
         </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="银行账号"
           >
@@ -168,6 +136,7 @@
               v-decorator="['bankNo']">
             </a-input>
           </a-form-item>
+
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
@@ -177,9 +146,12 @@
               v-decorator="['agent']">
             </a-input>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="供货类别"
           >
@@ -193,11 +165,7 @@
             </a-select>
           </a-form-item>
         </a-col>
-      </a-row>
-
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
-
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="授权书"
           >
@@ -206,53 +174,56 @@
           </a-form-item>
         </a-col>
         <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
-
           <a-form-item
             label="邮箱"
           >
             <a-input
-              v-decorator="['email', {rules: [{ required: true, message: '请输入正确的邮箱', pattern: /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/ }], validateTrigger: ['change', 'blur']}]"/>
+              v-decorator="['email', {rules: [{ message: '请输入正确的邮箱', pattern: /^[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*@[a-zA-Z0-9]+([-_.][a-zA-Z0-9]+)*\.[a-z]{2,}$/ }], validateTrigger: ['change', 'blur']}]"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
+      </a-row>
 
+      <a-row class="form-row" :gutter="16">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="QQ"
           >
             <a-input
               v-decorator="['qq']"/>
           </a-form-item>
-        </a-col>
-      </a-row>
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="7" :md="12" :sm="24">
 
+        </a-col>
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="微信"
           >
             <a-input
               v-decorator="['wechat']"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 15, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
+        <a-col :xl="{span: 7, offset: 1}" :lg="{span: 8}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="注册地址"
           >
             <a-input
               v-decorator="['registerAddress']"/>
           </a-form-item>
+
         </a-col>
       </a-row>
       <a-row class="form-row" :gutter="16">
-        <a-col :lg="11" :md="24" :sm="24">
+        <a-col :lg="7" :md="12" :sm="24">
           <a-form-item
             label="供货品牌"
           >
             <a-textarea
               v-decorator="['supplyBrand']"/>
           </a-form-item>
+
         </a-col>
-        <a-col :xl="{span: 11, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
+        <a-col :xl="{span: 15, offset: 1}" :lg="{span: 12}" :md="{span: 12}" :sm="24">
           <a-form-item
             label="主营业务"
           >
@@ -289,23 +260,23 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <title-divider title="状态" width="90px"></title-divider>
-      <a-row class="form-row" :gutter="16">
-        <a-col :lg="6" :md="6" :sm="6">
-          <a-form-item
-            label="状态"
-          >
-            <a-select v-decorator="['status', { rules: [{required: true, message: '状态不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in specialStatusMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-      </a-row>
+<!--      <title-divider title="状态" width="90px"></title-divider>-->
+<!--      <a-row class="form-row" :gutter="16">-->
+<!--        <a-col :lg="6" :md="6" :sm="6">-->
+<!--          <a-form-item-->
+<!--            label="状态"-->
+<!--          >-->
+<!--            <a-select v-decorator="['status', { rules: [{required: true, message: '状态不能为空'}]}]" placeholder="请选择">-->
+<!--              <a-select-option-->
+<!--                v-for="(label,value) in specialStatusMap"-->
+<!--                :key="value"-->
+<!--                :label="label"-->
+<!--                :value="parseInt(value)">{{ label }}-->
+<!--              </a-select-option>-->
+<!--            </a-select>-->
+<!--          </a-form-item>-->
+<!--        </a-col>-->
+<!--      </a-row>-->
     </a-form>
   </a-card>
 </template>