修改基础资料（客户详情，商品信息，费用信息，仓库信息） 页面，以及部分js 方法

src/api/basicdata/customerDetails/corps.js

@@ -34,6 +34,18 @@ export function updateCorps(data) {
     data: data
   })
 }
+// 状态修改
+export function changeCorpsStatus(fId, fStatus) {
+  const data = {
+    fId,
+    fStatus
+  }
+  return request({
+    url: '/basicdata/customerDetails/corps',
+    method: 'put',
+    data: data
+  })
+}
 
 // 删除客户详情
 export function delCorps(fId) {

src/api/basicdata/goods.js

@@ -35,6 +35,18 @@ export function updateGoods(data) {
   })
 }
 
+// 状态修改
+export function changeGoodsStatus(fId, fstatus) {
+  const data = {
+    fId,
+    fstatus
+  }
+  return request({
+    url: '/basicdata/goods',
+    method: 'put',
+    data: data
+  })
+}
 // 删除商品详情
 export function delGoods(fId) {
   return request({
@@ -50,4 +62,4 @@ export function exportGoods(query) {
     method: 'get',
     params: query
   })
-}
+}

src/api/basicdata/warehouse.js

@@ -35,6 +35,19 @@ export function updateWarehouse(data) {
   })
 }
 
+// 仓库状态修改
+export function changeWareStatus(fId, status) {
+  const data = {
+    fId,
+    status
+  }
+  return request({
+    url: '/basicdata/warehouse',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除仓库
 export function delWarehouse(fId) {
   return request({
@@ -50,4 +63,4 @@ export function exportWarehouse(query) {
     method: 'get',
     params: query
   })
-}
+}

src/views/basicdata/corps/index.vue

@@ -94,14 +94,29 @@
                         placeholder="选择合同至">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="筛选状态" prop="fStatus">
-        <el-input
+      <el-form-item label="状态" prop="fStatus">
+        <!--<el-input
           v-model="queryParams.fStatus"
           placeholder="请选择状态"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        />-->
+        <el-select
+          v-model="queryParams.fStatus"
+          placeholder="客户状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -172,7 +187,16 @@
           <span>{{ parseTime(scope.row.fContracte, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="fStatus" />
+      <el-table-column label="状态" align="center" prop="fStatus" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.fStatus"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
@@ -205,112 +229,223 @@
     <!-- 添加或修改客户详情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="766px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="客户类别" prop="fTypeid">
-          <el-select v-model="form.fTypeid" placeholder="请选择客户类别">
-            <el-option
-              v-for="dict in fTypeidOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="编号" prop="fNo">
-          <el-input v-model="form.fNo" style="width: 200px" placeholder="请输入编号" />
-        </el-form-item>
-        <el-form-item label="名称" prop="fName">
-          <el-input v-model="form.fName" style="width: 200px" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="简称" prop="fCname">
-          <el-input v-model="form.fCname" style="width: 200px" placeholder="请输入简称" />
-        </el-form-item>
-        <el-form-item label="英文名称" prop="fEname">
-          <el-input v-model="form.fEname" style="width: 200px" placeholder="请输入英文名称" />
-        </el-form-item>
-        <el-form-item label="电话" prop="fTel">
-          <el-input v-model="form.fTel" style="width: 200px" placeholder="请输入电话" />
-        </el-form-item>
-        <el-form-item label="传真" prop="fFax">
-          <el-input v-model="form.fFax" style="width: 200px" placeholder="请输入传真" />
-        </el-form-item>
-        <el-form-item label="邮箱" prop="fEmail">
-          <el-input v-model="form.fEmail" style="width: 200px" placeholder="请输入邮箱" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="fManage">
-          <el-input v-model="form.fManage" style="width: 200px" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="地址" prop="fAddr">
-          <el-input v-model="form.fAddr" style="width: 200px" placeholder="请输入地址" />
-        </el-form-item>
-        <el-form-item label="英文地址" prop="fEaddr">
-          <el-input v-model="form.fEaddr" style="width: 200px" placeholder="请输入英文地址" />
-        </el-form-item>
-        <el-form-item label="规模" prop="fScale">
-          <el-input v-model="form.fScale" style="width: 200px" placeholder="请输入规模" />
-        </el-form-item>
-        <el-form-item label="省" prop="fProvince">
-          <el-input v-model="form.fProvince" style="width: 200px" placeholder="请输入省" />
-        </el-form-item>
-        <el-form-item label="市" prop="fCity">
-          <el-input v-model="form.fCity" style="width: 200px" placeholder="请输入市" />
-        </el-form-item>
-        <el-form-item label="结算表票结、月结" prop="fStltypeid">
-          <el-select v-model="form.fStltypeid" style="width: 200px" placeholder="请选择结算表票结、月结">
-            <el-option
-              v-for="dict in fStltypeidOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="结费天数" prop="fStldays">
-          <el-input v-model="form.fStldays" style="width: 200px" placeholder="请输入结费天数" />
-        </el-form-item>
-        <el-form-item label="合同号" prop="fContractno">
-          <el-input v-model="form.fContractno" style="width: 200px" placeholder="请输入合同号" />
-        </el-form-item>
-        <el-form-item label="合同起" prop="fContractb">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.fContractb"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择合同起">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="合同至" prop="fContracte">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.fContracte"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择合同至">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="税号" prop="fTax">
-          <el-input v-model="form.fTax" style="width: 200px" placeholder="请输入税号" />
-        </el-form-item>
-        <el-form-item label="开票电话" prop="fInvtel">
-          <el-input v-model="form.fInvtel" style="width: 200px" placeholder="请输入开票电话" />
-        </el-form-item>
-        <el-form-item label="开票地址" prop="fInvaddr">
-          <el-input v-model="form.fInvaddr" style="width: 200px" placeholder="请输入开票地址" />
-        </el-form-item>
-        <el-form-item label="本位币账号" prop="fBankno">
-          <el-input v-model="form.fBankno" style="width: 200px" placeholder="请输入本位币账号" />
-        </el-form-item>
-        <el-form-item label="本位币银行" prop="fBankname">
-          <el-input v-model="form.fBankname" style="width: 200px" placeholder="请输入本位币银行" />
-        </el-form-item>
-        <el-form-item label="外币账号" prop="fUbankno">
-          <el-input v-model="form.fUbankno" style="width: 200px" placeholder="请输入外币账号" />
-        </el-form-item>
-        <el-form-item label="外币银行" prop="fUbankname">
-          <el-input v-model="form.fUbankname" style="width: 200px" placeholder="请输入外币银行" />
-        </el-form-item>
-        <el-form-item label="状态" prop="fStatus">
-          <el-input v-model="form.fStatus" style="width: 200px" placeholder="请输入状态默认 T ,正常T 停用F 下拉选择" />
-        </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="客户类别" prop="fTypeid">
+              <el-select v-model="form.fTypeid" placeholder="请选择客户类别">
+                <el-option
+                  v-for="dict in fTypeidOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="编号" prop="fNo">
+              <el-input v-model="form.fNo" style="width: 200px" placeholder="请输入编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fName">
+              <el-input v-model="form.fName" style="width: 200px" placeholder="请输入名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="简称" prop="fCname">
+              <el-input v-model="form.fCname" style="width: 200px" placeholder="请输入简称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="英文名称" prop="fEname">
+              <el-input v-model="form.fEname" style="width: 200px" placeholder="请输入英文名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电话" prop="fTel">
+              <el-input v-model="form.fTel" style="width: 200px" placeholder="请输入电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="传真" prop="fFax">
+              <el-input v-model="form.fFax" style="width: 200px" placeholder="请输入传真" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="fEmail">
+              <el-input v-model="form.fEmail" style="width: 200px" placeholder="请输入邮箱" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="fManage">
+              <el-input v-model="form.fManage" style="width: 200px" placeholder="请输入联系人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="fAddr">
+              <el-input v-model="form.fAddr" style="width: 200px" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="英文地址" prop="fEaddr">
+              <el-input v-model="form.fEaddr" style="width: 200px" placeholder="请输入英文地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规模" prop="fScale">
+              <el-input v-model="form.fScale" style="width: 200px" placeholder="请输入规模" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="省" prop="fProvince">
+              <el-input v-model="form.fProvince" style="width: 200px" placeholder="请输入省" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="市" prop="fCity">
+              <el-input v-model="form.fCity" style="width: 200px" placeholder="请输入市" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="结算表票结、月结" prop="fStltypeid">
+              <el-select v-model="form.fStltypeid" style="width: 200px" placeholder="请选择结算表票结、月结">
+                <el-option
+                  v-for="dict in fStltypeidOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结费天数" prop="fStldays">
+              <el-input v-model="form.fStldays" style="width: 200px" placeholder="请输入结费天数" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同号" prop="fContractno">
+              <el-input v-model="form.fContractno" style="width: 200px" placeholder="请输入合同号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="税号" prop="fTax">
+              <el-input v-model="form.fTax" style="width: 200px" placeholder="请输入税号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="合同起" prop="fContractb">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.fContractb"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择合同起">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="合同至" prop="fContracte">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.fContracte"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择合同至">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="开票电话" prop="fInvtel">
+              <el-input v-model="form.fInvtel" style="width: 200px" placeholder="请输入开票电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开票地址" prop="fInvaddr">
+              <el-input v-model="form.fInvaddr" style="width: 200px" placeholder="请输入开票地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="本位币账号" prop="fBankno">
+              <el-input v-model="form.fBankno" style="width: 200px" placeholder="请输入本位币账号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本位币银行" prop="fBankname">
+              <el-input v-model="form.fBankname" style="width: 200px" placeholder="请输入本位币银行" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="外币账号" prop="fUbankno">
+              <el-input v-model="form.fUbankno" style="width: 200px" placeholder="请输入外币账号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外币银行" prop="fUbankname">
+              <el-input v-model="form.fUbankname" style="width: 200px" placeholder="请输入外币银行" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <!--<el-radio-group v-model="form.fStatus">
+                <el-radio label="1">请选择字典生成</el-radio>
+              </el-radio-group>-->
+              <el-radio-group v-model="form.fStatus">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!--<el-form-item label="删除状态" prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+            </el-form-item>-->
+          </el-col>
+        </el-row>
+
+        <!--<el-form-item label="删除状态" prop="delFlag">
           <el-select v-model="form.delFlag" style="width: 200px" placeholder="请选择删除状态">
             <el-option
               v-for="dict in delFlagOptions"
@@ -319,7 +454,7 @@
               :value="dict.dictValue"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" style="width: 200px" placeholder="请输入备注" />
         </el-form-item>
@@ -361,7 +496,7 @@
 </template>
 
 <script>
-  import { listCorps, getCorps, delCorps, addCorps, updateCorps, exportCorps } from "@/api/basicdata/customerDetails/corps";
+  import { listCorps, getCorps, delCorps, addCorps, updateCorps, changeCorpsStatus,exportCorps } from "@/api/basicdata/customerDetails/corps";
 
   export default {
     name: "Corps",
@@ -386,6 +521,8 @@
         corpsList: [],
         // 弹出层标题
         title: "",
+        // 状态数据字典
+        statusOptions: [],
         // 是否显示弹出层
         open: false,
         // 客户类别字典
@@ -394,6 +531,8 @@
         fStltypeidOptions: [],
         // 删除状态字典
         delFlagOptions: [],
+        // 从表数据
+        dataList: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -430,9 +569,6 @@
         form: {},
         // 表单校验
         rules: {
-          fTypeid: [
-            { required: true, message: "客户类别不能为空", trigger: "change" }
-          ],
           fNo: [
             { required: true, message: "编号不能为空", trigger: "blur" }
           ],
@@ -456,6 +592,9 @@
       this.getDicts("data_delete_state").then(response => {
         this.delFlagOptions = response.data;
       });
+      this.getDicts("sys_normal_disable").then(response => {
+        this.statusOptions = response.data;
+      });
     },
     methods: {
       /** 查询客户详情列表 */
@@ -524,6 +663,21 @@
         };
         this.resetForm("form");
       },
+      // 状态修改
+      handleStatusChange(row) {
+        let text = row.fStatus === "0" ? "启用" : "停用";
+        this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeCorpsStatus(row.fId, row.fStatus);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.fStatus = row.fStatus === "0" ? "1" : "0";
+        });
+      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -567,7 +721,10 @@
                 this.getList();
               });
             } else {
-              addCorps(this.form).then(response => {
+              let formDate= new FormData()
+              formDate.append('corps',JSON.stringify(this.form));
+              formDate.append('customerContacts',JSON.stringify(this.dataList));
+              addCorps(formDate).then(response => {
                 this.msgSuccess("新增成功");
                 this.open = false;
                 this.getList();

src/views/basicdata/fees/index.vue

@@ -30,13 +30,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="计量单位" prop="fFeeunitid">
-        <el-input
-          v-model="queryParams.fFeeunitid"
-          placeholder="请输入计量单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.fFeeunitid" placeholder="请选择计量单位" clearable size="small">
+          <el-option
+            v-for="dict in fFeeunitidOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="币种" prop="fCurrency">
         <el-input
@@ -48,9 +49,25 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="fStatus">
-        <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
+       <!-- <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
+        </el-select>-->
+        <el-select
+          v-model="queryParams.fStatus"
+          placeholder="请选择状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in fDocumentOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
+
+
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -107,7 +124,7 @@
       <el-table-column label="费用属性" align="center" prop="fFeetype" :formatter="fFeetypeFormat" />
       <el-table-column label="计量单位" align="center" prop="fFeeunitid" :formatter="fFeeunitidFormat" />
       <el-table-column label="币种" align="center" prop="fCurrency" />
-      <el-table-column label="状态" align="center" prop="fStatus" />
+      <el-table-column label="状态" align="center" prop="fStatus" :formatter="statusFormat" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -140,38 +157,67 @@
     <!-- 添加或修改费用信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="编号" prop="fNo">
-          <el-input v-model="form.fNo" placeholder="请输入编号" />
-        </el-form-item>
-        <el-form-item label="名称" prop="fName">
-          <el-input v-model="form.fName" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="费用属性" prop="fFeetype">
-          <el-select v-model="form.fFeetype" placeholder="请选择费用属性">
-            <el-option
-              v-for="dict in fFeetypeOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="计量单位" prop="fFeeunitid">
-          <el-input v-model="form.fFeeunitid" placeholder="请输入计量单位" />
-        </el-form-item>
-        <el-form-item label="币种" prop="fCurrency">
-          <el-input v-model="form.fCurrency" placeholder="请输入币种" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-select v-model="form.fStatus" placeholder="状态">
-            <el-option
-              v-for="dict in fDocumentOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="编号" prop="fNo">
+              <el-input v-model="form.fNo" placeholder="请输入编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fName">
+              <el-input v-model="form.fName" placeholder="请输入名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="费用属性" prop="fFeetype">
+              <el-select v-model="form.fFeetype" placeholder="请选择费用属性">
+                <el-option
+                  v-for="dict in fFeetypeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="fFeeunitid">
+              <el-select v-model="form.fFeeunitid" placeholder="请选择计量单位">
+                <el-option
+                  v-for="dict in fFeeunitidOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="币种" prop="fCurrency">
+              <el-input v-model="form.fCurrency" placeholder="请输入币种" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-select v-model="form.fStatus" placeholder="状态">
+                <el-option
+                  v-for="dict in fDocumentOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -271,6 +317,10 @@ export default {
     fFeeunitidFormat(row, column) {
       return this.selectDictLabel(this.fFeeunitidOptions, row.fFeeunitid);
     },
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.fDocumentOptions, row.fStatus);
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/basicdata/goods/index.vue

@@ -74,9 +74,25 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="fStatus">
-        <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
+        <!--<el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
+        </el-select>-->
+        <el-select
+          v-model="queryParams.fStatus"
+          placeholder="商品状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
+
+
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -129,7 +145,7 @@
     <el-table v-loading="loading" :data="goodsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="状态" align="center" prop="fId" />
-      <el-table-column label="存储id" align="center" prop="fTypeid" />
+      <!--<el-table-column label="存储id" align="center" prop="fTypeid" />--><!-- 后期添加 -->
       <el-table-column label="编号" align="center" prop="fNo" />
       <el-table-column label="名称" align="center" prop="fName" />
       <el-table-column label="英文名称" align="center" prop="fEnam" />
@@ -138,7 +154,16 @@
       <el-table-column label="颜色" align="center" prop="fColor" />
       <el-table-column label="海关编码" align="center" prop="fHscode" />
       <el-table-column label="包装类型" align="center" prop="fPackageid" />
-      <el-table-column label="状态" align="center" prop="fStatus" />
+      <el-table-column label="状态" align="center" prop="fStatus" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.fStatus"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
         <template slot-scope="scope">
@@ -171,41 +196,83 @@
     <!-- 添加或修改商品详情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="存储id" prop="fTypeid">
+        <!--<el-form-item label="存储id" prop="fTypeid">
           <el-input v-model="form.fTypeid" placeholder="请输入存储id" />
-        </el-form-item>
-        <el-form-item label="编号" prop="fNo">
-          <el-input v-model="form.fNo" placeholder="请输入编号" />
-        </el-form-item>
-        <el-form-item label="名称" prop="fName">
-          <el-input v-model="form.fName" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="英文名称" prop="fEnam">
-          <el-input v-model="form.fEnam" placeholder="请输入英文名称" />
-        </el-form-item>
-        <el-form-item label="规格" prop="fSpecs">
-          <el-input v-model="form.fSpecs" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="包装规格" prop="fPackagespecs">
-          <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格" />
-        </el-form-item>
-        <el-form-item label="颜色" prop="fColor">
-          <el-input v-model="form.fColor" placeholder="请输入颜色" />
-        </el-form-item>
-        <el-form-item label="海关编码" prop="fHscode">
-          <el-input v-model="form.fHscode" placeholder="请输入海关编码" />
-        </el-form-item>
-        <el-form-item label="包装类型" prop="fPackageid">
-          <el-input v-model="form.fPackageid" placeholder="请输入包装类型" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.fStatus">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
+        </el-form-item>-->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="编号" prop="fNo">
+              <el-input v-model="form.fNo" placeholder="请输入编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fName">
+              <el-input v-model="form.fName" placeholder="请输入名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="英文名称" prop="fEnam">
+              <el-input v-model="form.fEnam" placeholder="请输入英文名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="规格" prop="fSpecs">
+              <el-input v-model="form.fSpecs" placeholder="请输入规格" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="包装规格" prop="fPackagespecs">
+              <el-input v-model="form.fPackagespecs" placeholder="请输入包装规格" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="颜色" prop="fColor">
+              <el-input v-model="form.fColor" placeholder="请输入颜色" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="海关编码" prop="fHscode">
+              <el-input v-model="form.fHscode" placeholder="请输入海关编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装类型" prop="fPackageid">
+              <el-input v-model="form.fPackageid" placeholder="请输入包装类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <!--<el-radio-group v-model="form.fStatus">
+                <el-radio label="1">请选择字典生成</el-radio>
+              </el-radio-group>-->
+              <el-radio-group v-model="form.fStatus">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <!--<el-form-item label="删除状态" prop="delFlag">
+              <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
+            </el-form-item>-->
+          </el-col>
+        </el-row>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -219,7 +286,7 @@
 </template>
 
 <script>
-  import { listGoods, getGoods, delGoods, addGoods, updateGoods, exportGoods } from "@/api/basicdata/goods";
+  import { listGoods, getGoods, delGoods, addGoods, updateGoods,changeGoodsStatus, exportGoods } from "@/api/basicdata/goods";
 
   export default {
     name: "Goods",
@@ -247,6 +314,8 @@
         open: false,
         // 备注字典
         fIdOptions: [],
+        // 状态数据字典
+        statusOptions: [],
         // 删除状态字典
         delFlagOptions: [],
         // 查询参数
@@ -268,9 +337,9 @@
         form: {},
         // 表单校验
         rules: {
-          fTypeid: [
+          /*fTypeid: [
             { required: true, message: "存储id 显示名称 下拉选择类别，一个商品名称对应一个类别,对应t_goodtype的f_id不能为空", trigger: "blur" }
-          ],
+          ],*/
           fNo: [
             { required: true, message: "编号不能为空", trigger: "blur" }
           ],
@@ -288,6 +357,9 @@
       this.getDicts("data_delete_state").then(response => {
         this.delFlagOptions = response.data;
       });
+      this.getDicts("sys_normal_disable").then(response => {
+        this.statusOptions = response.data;
+      });
     },
     methods: {
       /** 查询商品详情列表 */
@@ -316,7 +388,7 @@
       reset() {
         this.form = {
           fId: null,
-          fTypeid: null,
+         /* fTypeid: null, 下拉框 后期修改  */
           fNo: null,
           fName: null,
           fEnam: null,
@@ -335,6 +407,21 @@
         };
         this.resetForm("form");
       },
+      // 状态修改
+      handleStatusChange(row) {
+        let text = row.fStatus === "0" ? "启用" : "停用";
+        this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return changeGoodsStatus(row.fId, row.fStatus);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.fStatus = row.fStatus === "0" ? "1" : "0";
+        });
+      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;

src/views/basicdata/warehouse/index.vue

@@ -29,8 +29,22 @@
         />
       </el-form-item>
       <el-form-item label="状态" prop="fStatus">
-        <el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
+        <!--<el-select v-model="queryParams.fStatus" placeholder="请选择状态" clearable size="small">
           <el-option label="请选择字典生成" value="" />
+        </el-select>-->
+        <el-select
+          v-model="queryParams.fStatus"
+          placeholder="请选择状态"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -83,11 +97,22 @@
 
     <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="状态，默认 T ,正常T 停用F 下拉选择" align="center" prop="fId" />
+      <el-table-column type="index" label="序号" align="center"/>
+     <!-- <el-table-column label="状态，默认 T ,正常T 停用F 下拉选择" align="center" prop="fId" />-->
       <el-table-column label="编号" align="center" prop="fNo" />
       <el-table-column label="名称" align="center" prop="fName" />
       <el-table-column label="地址" align="center" prop="fAddr" />
-      <el-table-column label="状态，默认 T ,正常T 停用F 下拉选择" align="center" prop="fStatus" />
+      <!--<el-table-column label="状态，默认 T ,正常T 停用F 下拉选择" align="center" prop="fStatus" />-->
+      <el-table-column label="状态" align="center">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.fStatus"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,23 +145,45 @@
     <!-- 添加或修改仓库对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="编号" prop="fNo">
-          <el-input v-model="form.fNo" placeholder="请输入编号" />
-        </el-form-item>
-        <el-form-item label="名称" prop="fName">
-          <el-input v-model="form.fName" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="地址" prop="fAddr">
-          <el-input v-model="form.fAddr" placeholder="请输入地址" />
-        </el-form-item>
-        <el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="编号" prop="fNo">
+              <el-input v-model="form.fNo" placeholder="请输入编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="fName">
+              <el-input v-model="form.fName" placeholder="请输入名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="fAddr">
+              <el-input v-model="form.fAddr" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.fStatus">
+                <el-radio
+                  v-for="dict in statusOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                >{{dict.dictLabel}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <!--<el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">
           <el-radio-group v-model="form.fStatus">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
-        </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
+        </el-form-item>-->
+        <!--<el-form-item label="删除状态" prop="delFlag">
           <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -150,7 +197,7 @@
 </template>
 
 <script>
-import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse, exportWarehouse } from "../../../api/basicdata/warehouse";
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeWareStatus, exportWarehouse } from "../../../api/basicdata/warehouse";
 
 export default {
   name: "Warehouse",
@@ -172,6 +219,8 @@ export default {
       total: 0,
       // 仓库表格数据
       warehouseList: [],
+      // 状态数据字典
+      statusOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -203,6 +252,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
   },
   methods: {
     /** 查询仓库列表 */
@@ -236,6 +288,21 @@ export default {
       };
       this.resetForm("form");
     },
+    // 状态修改
+    handleStatusChange(row) {
+      let text = row.fStatus === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.fName + '"吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return changeWareStatus(row.fId, row.fStatus);
+      }).then(() => {
+        this.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.fStatus = row.fStatus === "0" ? "1" : "0";
+      });
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/warehouseBusiness/outStock/index.vue

@@ -187,7 +187,7 @@
       <el-table-column label="状态(数据字典),N 入" align="center" prop="fId" />
       <el-table-column
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
         align="center"
         prop="fBillno"
@@ -374,14 +374,14 @@ RK CK DB HZ
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
           prop="fBillno"
         >
           <el-input
             v-model="form.fBillno"
             placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
           />
         </el-form-item>
@@ -684,7 +684,7 @@ import {
   addWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
-} from "@/api/warehouseBusiness/warehouseOutStock";
+} from "@/api/warehouseBusiness/warehousebills";
 
 export default {
   name: "Warehousebills",

src/views/warehouseBusiness/warehousebills/index.vue

@@ -104,7 +104,7 @@
         >
         </el-date-picker>
       </el-form-item>
-
+      
       <el-form-item label="船名航次" prop="fVslvoy">
         <el-input
           v-model="queryParams.fVslvoy"
@@ -283,14 +283,14 @@
       </el-form-item>
       <el-form-item
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
         prop="fBillno"
       >
         <el-input
           v-model="queryParams.fBillno"
           placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
           clearable
           size="small"
@@ -501,7 +501,7 @@ RK CK DB HZ
       <el-table-column label="状态(数据字典),N 入" align="center" prop="fId" />
       <el-table-column
         label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
         align="center"
         prop="fBillno"
@@ -688,14 +688,14 @@ RK CK DB HZ
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item
           label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
           prop="fBillno"
         >
           <el-input
             v-model="form.fBillno"
             placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
+RK CK DB HZ 
 "
           />
         </el-form-item>
@@ -998,7 +998,7 @@ import {
   addWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
-} from "@/api/warehouseBusiness/warehouseInStock";
+} from "@/api/warehouseBusiness/warehousebills";
 
 export default {
   name: "Warehousebills",