规格修改

src/views/basicdata/fees/index.vue

@@ -7,7 +7,9 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="编号" prop="fNo">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="编号" prop="fNo">
         <el-input
           v-model="queryParams.fNo"
           placeholder="请输入编号"
@@ -16,7 +18,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="名称" prop="fName">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="名称" prop="fName">
         <el-input
           v-model="queryParams.fName"
           placeholder="请输入名称"
@@ -25,7 +29,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="物料类别" prop="fFeetype">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物料类别" prop="fFeetype">
         <el-select
           v-model="queryParams.fFeetype"
           placeholder="请选择物料类别"
@@ -40,7 +46,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计量单位" prop="fFeeunitid">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="计量单位" prop="fFeeunitid">
         <el-select
           v-model="queryParams.fFeeunitid"
           placeholder="请选择计量单位"
@@ -55,6 +63,8 @@
           />
         </el-select>
       </el-form-item>
+        </el-col>
+      </el-row>
 <!--      <el-form-item label="币种" prop="fCurrency">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.fCurrency"-->
@@ -64,36 +74,35 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item label="状态" prop="fStatus">
-        <!-- <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-collapse-transition>
+        <div v-show="show">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="状态" prop="fStatus">
+                <!-- <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: 200px"
+                >
+                  <el-option
+                    v-for="dict in fDocumentOptions"
+                    :key="dict.dictValue"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-collapse-transition>
+
       <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
       </el-form-item>
     </el-form>
 
@@ -141,6 +150,32 @@
         >
       </el-col>
       <div class="tabSetting">
+        <div style="margin-right: 20px">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+          >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+          >
+          <el-button
+            v-show="show"
+            @click="show = !show"
+            icon="el-icon-arrow-up"
+            size="mini"
+          >展开</el-button
+          >
+          <el-button
+            v-show="!show"
+            @click="show = !show"
+            icon="el-icon-arrow-down"
+            size="mini"
+          >展开</el-button
+          >
+        </div>
         <right-toolbar
           :showSearch.sync="showSearch"
           @queryTable="getList"
@@ -363,6 +398,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="规格" prop="fCurrency">
+              <el-input
+                v-model="form.fCurrency"
+                placeholder="请输入规格"
+                clearable
+                size="small"
+                style="width: 80%"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="计量单位" prop="fFeeunitid">
               <el-select
                 v-model="form.fFeeunitid"
@@ -378,9 +427,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="状态">-->
 <!--              <el-select-->
@@ -422,49 +468,50 @@
               <el-input v-model="form.fTaxSort" style="width: 80%"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="12">
             <el-form-item label="含税标识">
               <el-input v-model="form.fTaxTag" placeholder="" style="width: 80%">
               </el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12">
             <el-form-item label="税务代码">
               <el-input v-model="form.fTaxCode" placeholder="" style="width: 80%">
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="12">
             <el-form-item label="税率(%)">
               <el-input v-model="form.fTaxRate" style="width: 80%" oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+              <el-form-item label="是否享受优惠正常" label-width="140px">
+                <template>
+                  <el-radio v-model="form.fDiscounts" label="0">是</el-radio>
+                  <el-radio v-model="form.fDiscounts" label="1">否</el-radio>
+                </template>
+                <!--              <el-input v-model="form.fTaxRate" style="width: 80%"></el-input>-->
+              </el-form-item>
+            </el-col>
         </el-row>
-
         <el-row>
-
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input
-                style="width: 80%"
+                style="width: 90%"
                 v-model="form.remark"
                 type="textarea"
                 placeholder="请输入内容"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否享受优惠正常" label-width="140px">
-              <template>
-                <el-radio v-model="form.fDiscounts" label="0">是</el-radio>
-                <el-radio v-model="form.fDiscounts" label="1">否</el-radio>
-              </template>
-              <!--              <el-input v-model="form.fTaxRate" style="width: 80%"></el-input>-->
-            </el-form-item>
-          </el-col>
         </el-row>
 
       </el-form>
@@ -551,6 +598,8 @@ export default {
   components: { draggable },
   data() {
     return {
+      //控制搜索折叠
+      show: false,
       //全屏放大
       dialogFull: false,
       // 遮罩层
@@ -596,6 +645,7 @@ export default {
         fName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
         fFeetype: [{ required: true, message: "物料类别不能为空", trigger: "blur" }],
         fFeeunitid: [{ required: true, message: "计量单位不能为空", trigger: "blur" }],
+        fCurrency: [{ required: true, message: "规格不能为空", trigger: "blur" }],
       },
       showSetting: false,
       drag: false,
@@ -991,4 +1041,7 @@ export default {
   background-color: rgba(0, 0, 0, 0.05);
   height: 100%;
 }
+.app-container ::v-deep .el-form-item {
+  margin-bottom: 4px;
+}
 </style>

src/views/project/index1.vue

@@ -727,6 +727,14 @@ export default {
         },
         {
           surface: "2",
+          label: "fCurrency",
+          name: "规格",
+          checked: 0,
+          width: 100,
+          changeable:2
+        },
+        {
+          surface: "3",
           label: "fStudentsWeight",
           name: "学生重量（人）",
           checked: 0,
@@ -734,7 +742,7 @@ export default {
           changeable:2
         },
         {
-          surface: "3",
+          surface: "4",
           label: "fTeachersWeight",
           name: "教师重量（人）",
           checked: 0,
@@ -742,7 +750,7 @@ export default {
           changeable:2
         },
         {
-          surface: "4",
+          surface: "5",
           label: "fMeasure",
           name: "计量单位",
           checked: 0,
@@ -750,7 +758,7 @@ export default {
           changeable:1
         },
         {
-          surface: "5",
+          surface: "6",
           label: "fError",
           name: "误差比列",
           checked: 0,
@@ -758,7 +766,7 @@ export default {
           changeable:2
         },
         {
-          surface: "6",
+          surface: "7",
           label: "fStatus",
           name: "状态",
           checked: 0,
@@ -766,7 +774,7 @@ export default {
           changeable:2
         },
         {
-          surface: "7",
+          surface: "8",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -866,10 +874,12 @@ export default {
     },
     //物料带出单位
     change(scope){
+      console.log(this.materialOption)
       for(let item in this.detailList){
         for(let li in this.materialOption){
           if(this.detailList[item].fMaterial == this.materialOption[li].fId){
             this.$set(this.detailList[item],'fMeasure',JSON.stringify(this.materialOption[li].fFeeunitid))
+            this.$set(this.detailList[item],'fCurrency',this.materialOption[li].fCurrency)
           }
         }
       }

src/views/purchaseRequest/index.vue

@@ -315,6 +315,15 @@ export default {
           changeable: 1
         }, {
           surface: '3',
+          label: 'fCurrency',
+          name: '规格',
+          checked: 0,
+          width: 100,
+          onabort: '',
+          disabled: false,
+          changeable: 1
+        },{
+          surface: '4',
           label: 'fUnitprice',
           name: '单价',
           checked: 0,
@@ -323,7 +332,7 @@ export default {
           onabort: 'this.value=this.value.replace(/[^\\-?\\d.]/g,"").replace(/^(\\-)*(\\d+)\\.(\\d\\d).*$/, "$1$2.$3")',
           changeable: 2
         }, {
-          surface: '4',
+          surface: '5',
           label: 'fPurchase',
           name: '采购数量',
           checked: 0,
@@ -332,7 +341,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '5',
+          surface: '6',
           label: 'fQty',
           name: '实际数量',
           checked: 0,
@@ -341,7 +350,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '6',
+          surface: '7',
           label: 'fFeeunitid',
           name: '计量单位',
           checked: 0,
@@ -350,7 +359,7 @@ export default {
           disabled: false,
           changeable: 1
         }, {
-          surface: '7',
+          surface: '8',
           label: 'fAmount',
           name: '金额',
           checked: 0,
@@ -359,7 +368,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '8',
+          surface: '9',
           label: 'fStltypeid',
           name: '付费方式',
           checked: 0,
@@ -368,7 +377,7 @@ export default {
           disabled: false,
           changeable: 1
         }, {
-          surface: '9',
+          surface: '10',
           label: 'remark',
           name: '备注',
           checked: 0,
@@ -377,7 +386,7 @@ export default {
           disabled: false,
           changeable: 2
         }, {
-          surface: '10',
+          surface: '11',
           label: 'createTime',
           name: '申请日期',
           checked: 0,
@@ -385,7 +394,7 @@ export default {
           width: 100,
           onabort: ''
         }, {
-          surface: '11',
+          surface: '12',
           label: 'createBy',
           name: '申请人',
           disabled: false,
@@ -393,7 +402,7 @@ export default {
           width: 100,
           onabort: ''
         }, {
-          surface: '12',
+          surface: '13',
           label: 'fReviewDate',
           name: '审核日期',
           checked: 0,
@@ -401,7 +410,7 @@ export default {
           width: 100,
           onabort: ''
         }, {
-          surface: '13',
+          surface: '14',
           label: 'operation',
           name: '操作',
           checked: 0,
@@ -714,7 +723,8 @@ export default {
           this.listData.fFeeid.push({
             label: res.rows[item].fName,
             value: res.rows[item].fId,
-            fFeeunitid: res.rows[item].fFeeunitid
+            fFeeunitid: res.rows[item].fFeeunitid,
+            fCurrency: res.rows[item].fCurrency
           })
         }
       }
@@ -770,6 +780,7 @@ export default {
           if(this.contentList[item].fFeeid == this.listData.fFeeid[li].value){
             console.log("111")
             this.$set(this.contentList[item],'fFeeunitid',this.listData.fFeeid[li].fFeeunitid)
+            this.$set(this.contentList[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
           }
         }
       }

src/views/warehouse/inStock/index.vue

@@ -402,8 +402,18 @@ export default {
           width: 200,
           changeable:1,
           data:[],
-        },{
+        },
+        {
           surface: "3",
+          label: "fCurrency",
+          name: "规格",
+          checked: 0,
+          width: 200,
+          changeable:1,
+          data:[],
+        },
+        {
+          surface: "4",
           label: "fUnitprice",
           name: "单价",
           checked: 0,
@@ -413,7 +423,7 @@ export default {
           disabled:false,
           onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
         },{
-          surface: "4",
+          surface: "5",
           label: "fQty",
           name: "数量",
           checked: 0,
@@ -423,7 +433,7 @@ export default {
           disabled:false,
           onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
         },{
-          surface: "5",
+          surface: "6",
           label: "fFeeunitid",
           name: "计量单位",
           checked: 0,
@@ -433,7 +443,7 @@ export default {
           data:[],
           disabled:false
         },{
-          surface: "6",
+          surface: "7",
           label: "fWarehouseid",
           name: "库区",
           checked: 0,
@@ -443,7 +453,7 @@ export default {
           data:[],
           disabled:false
         },{
-          surface: "7",
+          surface: "8",
           label: "fAmount",
           name: "金额",
           checked: 0,
@@ -453,7 +463,7 @@ export default {
           disabled: true,
           doNot:'1'
         },{
-          surface: "8",
+          surface: "9",
           label: "fStltypeid",
           name: "付费方式",
           checked: 0,
@@ -464,7 +474,7 @@ export default {
           disabled:false
         },
         {
-          surface: "9",
+          surface: "10",
           label: "tProductdate",
           name: "生产日期",
           checked: 0,
@@ -474,7 +484,7 @@ export default {
           data:[],
           disabled:false
         },{
-          surface: "10",
+          surface: "11",
           label: "fLotno",
           name: "批号",
           checked: 0,
@@ -485,7 +495,7 @@ export default {
           disabled:false
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fValid",
           name: "保质期限",
           checked: 0,
@@ -497,7 +507,7 @@ export default {
           onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
         },
         {
-          surface: "12",
+          surface: "13",
           label: "fUnits",
           name: "单位",
           checked: 0,
@@ -508,7 +518,7 @@ export default {
           disabled:false
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fStoreEnv",
           name: "存储环境",
           checked: 0,
@@ -519,7 +529,7 @@ export default {
           disabled:false
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fIsfilles",
           name: "索证索票",
           checked: 0,
@@ -529,7 +539,7 @@ export default {
           disabled:false
         },
         {
-          surface: "15",
+          surface: "16",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -538,7 +548,7 @@ export default {
           changeable: 2,
           disabled:false
         },{
-          surface: "16",
+          surface: "17",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
@@ -549,7 +559,7 @@ export default {
           doNot:'1'
         },
         {
-          surface: "17",
+          surface: "18",
           label: "createBy",
           name: "申请人",
           checked: 0,
@@ -559,7 +569,7 @@ export default {
           disabled:true,
           doNot:'1'
         },{
-          surface: "18",
+          surface: "19",
           label: "fMaterial10",
           name: "操作",
           checked: 0,
@@ -799,6 +809,8 @@ export default {
         for(let li in this.listData.fFeeid){
           if(this.detailData[item].fFeeid == this.listData.fFeeid[li].value){
             this.$set(this.detailData[item],'fFeeunitid',JSON.stringify(this.listData.fFeeid[li].fFeeunitid))
+            this.$set(this.detailData[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
+            console.log(this.detailData)
           }
         }
       }
@@ -998,7 +1010,8 @@ export default {
           this.listData.fFeeid.push({
             label:res.rows[item].fName,
             value:res.rows[item].fId,
-            fFeeunitid: res.rows[item].fFeeunitid
+            fFeeunitid: res.rows[item].fFeeunitid,
+            fCurrency: res.rows[item].fCurrency
           })
         }
       })

src/views/warehouse/outStock/index.vue

@@ -402,8 +402,18 @@ export default {
           width: 200,
           changeable:1,
           data:[],
-        },{
+        },
+        {
           surface: "3",
+          label: "fCurrency",
+          name: "规格",
+          checked: 0,
+          width: 100,
+          changeable:1,
+          data:[],
+        },
+        {
+          surface: "4",
           label: "fUnitprice",
           name: "单价",
           checked: 0,
@@ -413,7 +423,7 @@ export default {
           disabled:false,
           onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
         },{
-          surface: "4",
+          surface: "5",
           label: "fQty",
           name: "数量",
           checked: 0,
@@ -423,7 +433,7 @@ export default {
           disabled:false,
           onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
         },{
-          surface: "5",
+          surface: "6",
           label: "fFeeunitid",
           name: "计量单位",
           checked: 0,
@@ -433,7 +443,7 @@ export default {
           data:[],
           disabled:false
         },{
-          surface: "6",
+          surface: "7",
           label: "fWarehouseid",
           name: "库区",
           checked: 0,
@@ -443,7 +453,7 @@ export default {
           data:[],
           disabled:false
         },{
-          surface: "7",
+          surface: "8",
           label: "fAmount",
           name: "金额",
           checked: 0,
@@ -453,7 +463,7 @@ export default {
           disabled: true,
           doNot:'1'
         },{
-          surface: "8",
+          surface: "9",
           label: "fStltypeid",
           name: "付费方式",
           checked: 0,
@@ -529,7 +539,7 @@ export default {
         //   disabled:false
         // },
         {
-          surface: "15",
+          surface: "10",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -538,7 +548,7 @@ export default {
           changeable: 2,
           disabled:false
         },{
-          surface: "16",
+          surface: "11",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
@@ -549,7 +559,7 @@ export default {
           doNot:'1'
         },
         {
-          surface: "17",
+          surface: "12",
           label: "createBy",
           name: "申请人",
           checked: 0,
@@ -559,7 +569,7 @@ export default {
           disabled:true,
           doNot:'1'
         },{
-          surface: "18",
+          surface: "13",
           label: "fMaterial10",
           name: "操作",
           checked: 0,
@@ -799,6 +809,7 @@ export default {
         for(let li in this.listData.fFeeid){
           if(this.detailData[item].fFeeid == this.listData.fFeeid[li].value){
             this.$set(this.detailData[item],'fFeeunitid',JSON.stringify(this.listData.fFeeid[li].fFeeunitid))
+            this.$set(this.detailData[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
           }
         }
       }
@@ -994,7 +1005,8 @@ export default {
           this.listData.fFeeid.push({
             label:res.rows[item].fName,
             value:res.rows[item].fId,
-            fFeeunitid: res.rows[item].fFeeunitid
+            fFeeunitid: res.rows[item].fFeeunitid,
+            fCurrency: res.rows[item].fCurrency
           })
         }
       })

vue.config.js

@@ -34,9 +34,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.1.143:9020`,
+        target: `http://192.168.1.143:9020`,
         // target: `http://localhost:8080`,
-        target: `https://ap.tubaosoft.com/prod-api/`,
+        // target: `https://ap.tubaosoft.com/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''