Qukaidi 4 år sedan
förälder
incheckning
a39394cb15
2 ändrade filer med 259 tillägg och 242 borttagningar
  1. 6 2
      src/views/Warehousing/outStock/AddOrUpdate.vue
  2. 253 240
      src/views/basicdata/corps/index.vue

+ 6 - 2
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -2000,7 +2000,11 @@
           sortable
         >
           <template slot-scope="scope">
-            <span v-if="item.label == 'fQtyblc2'">
+            <span v-if="item.label == 'fGoodsid'">
+              {{ fGoodsid | goodsFormat }}
+            </span>
+
+            <span v-else-if="item.label == 'fQtyblc2'">
               <el-input
                 @change="qtyChange(scope.row)"
                 v-model="scope.row.fQtyblc2"
@@ -3149,7 +3153,7 @@ export default {
 
         {
           surface: "3",
-          label: "fGoodsids",
+          label: "fGoodsid",
           name: "品名",
           checked: 0,
           width: 100,

+ 253 - 240
src/views/basicdata/corps/index.vue

@@ -127,11 +127,11 @@
         >
       </el-col>
       <div class="tabSetting">
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-         <div style="margin: 0 12px">
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+        <div style="margin: 0 12px">
           <el-tooltip
             class="item"
             effect="dark"
@@ -206,7 +206,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-           <el-table-column
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -436,247 +436,259 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="传真" prop="fFax">
-              <el-input
-                v-model="form.fFax"
-                style="width: 250px"
-                placeholder="请输入传真"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="邮箱" prop="fEmail">
-              <el-input
-                v-model="form.fEmail"
-                style="width: 250px"
-                placeholder="请输入邮箱"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系人" prop="fManage">
-              <el-input
-                v-model="form.fManage"
-                style="width: 250px"
-                placeholder="请输入联系人"
-              />
-            </el-form-item>
-          </el-col>
+          <div style="display: flex; justify-content: flex-end">
+            <el-button @click="showForm = !showForm"
+              >{{ showForm ? "隐藏" : "更多" }}
+            </el-button>
+          </div>
         </el-row>
+        <div v-if="showForm">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="传真" prop="fFax">
+                <el-input
+                  v-model="form.fFax"
+                  style="width: 250px"
+                  placeholder="请输入传真"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="邮箱" prop="fEmail">
+                <el-input
+                  v-model="form.fEmail"
+                  style="width: 250px"
+                  placeholder="请输入邮箱"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="联系人" prop="fManage">
+                <el-input
+                  v-model="form.fManage"
+                  style="width: 250px"
+                  placeholder="请输入联系人"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="地址" prop="fAddr">
-              <el-input
-                v-model="form.fAddr"
-                style="width: 250px"
-                placeholder="请输入地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="英文地址" prop="fEaddr">
-              <el-input
-                v-model="form.fEaddr"
-                style="width: 250px"
-                placeholder="请输入英文地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="规模" prop="fScale">
-              <el-input
-                v-model="form.fScale"
-                style="width: 250px"
-                placeholder="请输入规模"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="地址" prop="fAddr">
+                <el-input
+                  v-model="form.fAddr"
+                  style="width: 250px"
+                  placeholder="请输入地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="英文地址" prop="fEaddr">
+                <el-input
+                  v-model="form.fEaddr"
+                  style="width: 250px"
+                  placeholder="请输入英文地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="规模" prop="fScale">
+                <el-input
+                  v-model="form.fScale"
+                  style="width: 250px"
+                  placeholder="请输入规模"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="省" prop="fProvince">
-              <el-input
-                v-model="form.fProvince"
-                style="width: 250px"
-                placeholder="请输入省"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="市" prop="fCity">
-              <el-input
-                v-model="form.fCity"
-                style="width: 250px"
-                placeholder="请输入市"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="结算方式" prop="fStltypeid">
-              <el-select
-                v-model="form.fStltypeid"
-                style="width: 250px"
-                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-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="省" prop="fProvince">
+                <el-input
+                  v-model="form.fProvince"
+                  style="width: 250px"
+                  placeholder="请输入省"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="市" prop="fCity">
+                <el-input
+                  v-model="form.fCity"
+                  style="width: 250px"
+                  placeholder="请输入市"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="结算方式" prop="fStltypeid">
+                <el-select
+                  v-model="form.fStltypeid"
+                  style="width: 250px"
+                  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-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="结费天数" prop="fStldays">
-              <el-input
-                v-model="form.fStldays"
-                style="width: 250px"
-                placeholder="请输入结费天数"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同号" prop="fContractno">
-              <el-input
-                v-model="form.fContractno"
-                style="width: 250px"
-                placeholder="请输入合同号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="税号" prop="fTax">
-              <el-input
-                v-model="form.fTax"
-                style="width: 250px"
-                placeholder="请输入税号"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="结费天数" prop="fStldays">
+                <el-input
+                  v-model="form.fStldays"
+                  style="width: 250px"
+                  placeholder="请输入结费天数"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同号" prop="fContractno">
+                <el-input
+                  v-model="form.fContractno"
+                  style="width: 250px"
+                  placeholder="请输入合同号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="税号" prop="fTax">
+                <el-input
+                  v-model="form.fTax"
+                  style="width: 250px"
+                  placeholder="请输入税号"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="合同起" prop="fContractb">
-              <el-date-picker
-                clearable
-                size="small"
-                style="width: 250px"
-                v-model="form.fContractb"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择合同起"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同至" prop="fContracte">
-              <el-date-picker
-                clearable
-                size="small"
-                style="width: 250px"
-                v-model="form.fContracte"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择合同至"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="开票电话" prop="fInvtel">
-              <el-input
-                v-model="form.fInvtel"
-                style="width: 250px"
-                placeholder="请输入开票电话"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="合同起" prop="fContractb">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 250px"
+                  v-model="form.fContractb"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择合同起"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="合同至" prop="fContracte">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 250px"
+                  v-model="form.fContracte"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择合同至"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="开票电话" prop="fInvtel">
+                <el-input
+                  v-model="form.fInvtel"
+                  style="width: 250px"
+                  placeholder="请输入开票电话"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="开票地址" prop="fInvaddr">
-              <el-input
-                v-model="form.fInvaddr"
-                style="width: 250px"
-                placeholder="请输入开票地址"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="本位币账号" prop="fBankno" label-width="100">
-              <el-input
-                v-model="form.fBankno"
-                style="width: 250px"
-                placeholder="请输入本位币账号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="本位币银行" label-width="100" prop="fBankname">
-              <el-input
-                v-model="form.fBankname"
-                style="width: 250px"
-                placeholder="请输入本位币银行"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="开票地址" prop="fInvaddr">
+                <el-input
+                  v-model="form.fInvaddr"
+                  style="width: 250px"
+                  placeholder="请输入开票地址"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="本位币账号" prop="fBankno" label-width="100">
+                <el-input
+                  v-model="form.fBankno"
+                  style="width: 250px"
+                  placeholder="请输入本位币账号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
+                label="本位币银行"
+                label-width="100"
+                prop="fBankname"
+              >
+                <el-input
+                  v-model="form.fBankname"
+                  style="width: 250px"
+                  placeholder="请输入本位币银行"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="外币账号" prop="fUbankno">
-              <el-input
-                v-model="form.fUbankno"
-                style="width: 250px"
-                placeholder="请输入外币账号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="外币银行" prop="fUbankname">
-              <el-input
-                v-model="form.fUbankname"
-                style="width: 250px"
-                placeholder="请输入外币银行"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="状态">
-              <!--<el-radio-group v-model="form.fStatus">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="外币账号" prop="fUbankno">
+                <el-input
+                  v-model="form.fUbankno"
+                  style="width: 250px"
+                  placeholder="请输入外币账号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="外币银行" prop="fUbankname">
+                <el-input
+                  v-model="form.fUbankname"
+                  style="width: 250px"
+                  placeholder="请输入外币银行"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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-row>
+                <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="备注" prop="remark">
-          <el-input
-            v-model="form.remark"
-            style="width: 400px"
-            placeholder="请输入备注"
-          />
-        </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              style="width: 400px"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </div>
       </el-form>
       <div>
         <el-row :gutter="10" class="mb8">
@@ -845,7 +857,7 @@ Vue.directive("dialogDrag", {
 
 export default {
   name: "Corps",
-  components: {draggable},
+  components: { draggable },
   data() {
     return {
       disCorps: false,
@@ -1012,10 +1024,11 @@ export default {
         },
       ],
       allCheck: false,
+      showForm: false,
     };
   },
   created() {
-      this.setRowList = this.tableDate;
+    this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
     this.getList();
     this.getDicts("data_customer_category").then((response) => {
@@ -1283,7 +1296,7 @@ export default {
               0,
               this.form.fTypename.length - 1
             );
-            if(this.contactList.length==0&&Cookies.get("sysType") == 2){
+            if (this.contactList.length == 0 && Cookies.get("sysType") == 2) {
               return this.$message.error("联系人不能为空");
             }
             formDate.append("corps", JSON.stringify(this.form));
@@ -1314,7 +1327,7 @@ export default {
               0,
               this.form.fTypename.length - 1
             );
-            if(this.contactList.length==0&&Cookies.get("sysType") == 2){
+            if (this.contactList.length == 0 && Cookies.get("sysType") == 2) {
               return this.$message.error("联系人不能为空");
             }
             formDate.append("corps", JSON.stringify(this.form));