出入库打印

src/combination/listComponent.vue

@@ -100,6 +100,8 @@
               :disabled="item.disabled"
               style="width: 100%"
               placeholder="选择日期"
+              format="yyyy - MM - dd"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </span>

src/layout/components/TagsView/index.vue

@@ -144,6 +144,7 @@ export default {
       })
     },
     refreshSelectedTag(view) {
+      console.log(view)
       this.$store.dispatch('tagsView/delCachedView', view).then(() => {
         const { fullPath } = view
         this.$nextTick(() => {

src/views/project/index1.vue

@@ -244,32 +244,32 @@
             >查看
             </el-button
             >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="handleUpdate(scope.row, 1)"
-              v-hasPermi="['finance:invoiceApplyFor:query']"
-              v-if="
-              scope.row.fBillstatusName == '提交审核' ||
-              scope.row.fBillstatusName == '审核中'
-            "
-            >审批进度
-            </el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row,2)"
-              v-hasPermi="['finance:invoiceApplyFor:query']"
-              v-if="
-              scope.row.fBillstatusName == '保存' ||
-              scope.row.fBillstatusName == '暂存' ||
-              scope.row.fBillstatusName == '审批驳回'
-            "
-            >修改
-            </el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-view"-->
+<!--              @click="handleUpdate(scope.row, 1)"-->
+<!--              v-hasPermi="['finance:invoiceApplyFor:query']"-->
+<!--              v-if="-->
+<!--              scope.row.fBillstatusName == '提交审核' ||-->
+<!--              scope.row.fBillstatusName == '审核中'-->
+<!--            "-->
+<!--            >审批进度-->
+<!--            </el-button-->
+<!--            >-->
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-edit"-->
+<!--              @click="handleUpdate(scope.row,2)"-->
+<!--              v-hasPermi="['finance:invoiceApplyFor:query']"-->
+<!--              v-if="-->
+<!--              scope.row.fBillstatusName == '保存' ||-->
+<!--              scope.row.fBillstatusName == '暂存' ||-->
+<!--              scope.row.fBillstatusName == '审批驳回'-->
+<!--            "-->
+<!--            >修改-->
+<!--            </el-button>-->
             <el-button
               size="mini"
               type="text"
@@ -364,6 +364,9 @@
         <el-col :span="1.5">
           <el-button size="mini" :disabled="doNot" type="primary" @click="approval">请核</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button size="mini" v-if="detailform.fBillstatus >= 4" type="primary" @click="addOrUpdateHandle">查看审批</el-button>
+        </el-col>
         <div style="margin: 0 12px;float: right">
           <el-button
             icon="el-icon-setting"
@@ -510,6 +513,16 @@
       <div>
       </div>
     </div>
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+    <approval-comments
+      v-if="addOrUpdateVisib"
+      ref="ApprovalComments"
+      @refreshDataList="returnData"
+    ></approval-comments>
   </div>
 </template>
 
@@ -582,6 +595,8 @@ export default {
   },
   data() {
     return {
+      addOrUpdateVisible: false,
+      addOrUpdateVisib: false,
       liableOption:[],
       ids:[],
       doNotchange:false,
@@ -800,6 +815,46 @@ export default {
 
   },
   methods: {
+    // 查看审批流
+    getDataList() {
+      this.addOrUpdateVisible = false;
+    },
+    returnData() {
+      this.addOrUpdateVisib = false;
+      this.open = false;
+      this.cancelTwo();
+    },
+    addOrUpdateHandle() {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(this.detailform.fId,510);
+      });
+    },
+    //首页审批跳转关闭返回首页
+    cancelTwo() {
+      this.open = false
+      let view = {
+        fullPath: "/project",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "Project",
+        params: Object,
+        path: "/project",
+        query: Object,
+        title: "项目管理"
+      }
+      this.$router.push({ path: '/index' })
+      this.$store
+        .dispatch('tagsView/delView', view)
+        .then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+      Global.$emit('removeCache', 'closeSelectedTag', view)
+    },
+
     //请核
     approval(){
       let formData = new window.FormData();
@@ -866,13 +921,16 @@ export default {
             this.$set(this.detailList[li], 'fMeasure', JSON.stringify(this.detailList[li].fMeasure))
           }
         }
-        if (res == 0 || res == 1) {
+        console.log(this.detailform.fBillstatus)
+        if(this.detailform.fBillstatus >= 4){
           this.doNot = true
           this.doNotchange = true
-        } else {
+        }else{
+          console.log("111")
           this.doNot = true
-          this.doNotchange = false
+
         }
+
         this.mainTabel = true
       })
     },

src/views/purchaseIssue/index.vue

@@ -73,6 +73,16 @@
         :listData="listData"
       />
     </div>
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+    <approval-comments
+      v-if="addOrUpdateVisib"
+      ref="ApprovalComments"
+      @refreshDataList="returnData"
+    ></approval-comments>
     <el-dialog
       title="打印采购"
       :visible.sync="dialogVisible"
@@ -161,6 +171,8 @@ export default {
   name: 'index',
   data() {
     return {
+      addOrUpdateVisib: false,
+      addOrUpdateVisible: false,
       total:0,
       formDataList:{
         fBilltype: 'XS',
@@ -255,15 +267,24 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
-        },{
+        },
+        {
           surface: '10',
+          label: 'fBsdate',
+          name: '出库日期',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '11',
           label: 'remark',
           name: '备注',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '11',
+          surface: '12',
           label: 'operation',
           name: '操作',
           checked: 0,
@@ -466,6 +487,13 @@ export default {
           name: '请核',
           disabled: false
         },{
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit-outline',
+          name: '查看审批',
+          disabled: false
+        },
+        {
           type: 'info',
           size: 'mini',
           icon: 'el-icon-edit-outline',
@@ -516,7 +544,7 @@ export default {
           rules: [{ required: false, message: ' ' }]
         }, {
           span: 6,
-          label: 'cLoadDate',
+          label: 'timeInterval',
           name: '出库日期',
           inputType: 3,
           width: 200,
@@ -708,6 +736,46 @@ export default {
     this.fCompany(2)
   },
   methods: {
+    // 查看审批流
+    getDataList() {
+      this.addOrUpdateVisible = false;
+    },
+    returnData() {
+      this.addOrUpdateVisib = false;
+      this.open = false;
+      this.cancelTwo();
+    },
+    addOrUpdateHandle() {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(this.$refs.avatar.form.fId,550);
+      });
+    },
+    //首页审批跳转关闭返回首页
+    cancelTwo() {
+      this.open = false
+      let view = {
+        fullPath: "/purchaseIssue",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "PurchaseIssue",
+        params: Object,
+        path: "/purchaseIssue",
+        query: Object,
+        title: "销售出库"
+      }
+      this.$router.push({ path: '/index' })
+      this.$store
+        .dispatch('tagsView/delView', view)
+        .then(({ visitedViews }) => {
+          if (this.isActive(view)) {
+            this.toLastView(visitedViews, view)
+          }
+        })
+      Global.$emit('removeCache', 'closeSelectedTag', view)
+    },
+
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.formDataList.pageSize = val
@@ -819,7 +887,7 @@ export default {
           this.$refs.avatar.form = {}
           this.getRow(data,list)
             for(let li in this.contentButton){
-              if(this.contentButton[li].name == '返回列表' || this.contentButton[li].name == '修改'){
+              if(this.contentButton[li].name == '返回列表' || this.contentButton[li].name == '修改' || this.contentButton[li].name == '查看审批'){
                 this.contentButton[li].disabled = false
               }else {
                 this.contentButton[li].disabled = true
@@ -842,7 +910,7 @@ export default {
           this.contentOption.forEach(item => item.disabled = true)
           this.contentStyle.forEach(item => item.disabled = true)
           this.contentButton.forEach(item =>{
-            if (item.name == '返回列表'){
+            if (item.name == '返回列表' || item.name == '查看审批'){
               item.disabled = false
             }else {
               item.disabled = true
@@ -891,6 +959,13 @@ export default {
       for(let li in this.contentList){
         this.$refs.avatar.form.fMoney += Number(this.contentList[li].fAmount)
       }
+      console.log(this.dataList.fGoodsid)
+      this.dataList.fGoodsid.forEach(item => {
+        if (item.value == this.$refs.avatar.form.fGoodsid) {
+          this.$refs.avatar.form.fCorpid = item.fCorpid
+        }
+      })
+      console.log(this.$refs.avatar.form)
       formData.append('tWarehousebills', JSON.stringify(this.$refs.avatar.form))
       formData.append('tWarehousebillsfees', JSON.stringify(this.contentList))
       formData.append('fBilltype', 'XS')
@@ -959,8 +1034,8 @@ export default {
           break
         case '修改':
           this.contentButton.forEach(item =>{
-            if (this.$refs.avatar.form.fBillstatus > 4){
-              if (item.name === '返回列表' || item.name === '修改' || item.name === '申请发票'){
+            if (this.$refs.avatar.form.fBillstatus >= 4){
+              if (item.name === '返回列表' || item.name === '修改' || item.name === '申请发票' || item.name === '查看审批'){
                 item.disabled = false
               }else {
                 item.disabled = true
@@ -1026,6 +1101,9 @@ export default {
             this.$message.error("请先保存")
           }
           break
+        case '查看审批':
+          this.addOrUpdateHandle()
+          break
         default:
           this.$message.error('该按钮暂无功能')
       }

src/views/warehouse/inStock/index.vue

@@ -78,73 +78,48 @@
       style="padding: 0;margin:0"
       width="70%">
       <div ref="print">
-        <table class="table table-striped table-bordered" align="center" border="1"
-               style="border-collapse: collapse; border: none;">
+        <table class="table table-striped table-bordered" align="center" valign="center" style="font-size: 12px;border-collapse: collapse; border: none;margin-top: 10px;" >
           <tr>
-            <td style="font-size: 24px;font-weight:bold; border: 1px solid #000; padding:10px" class="column" width="1400" align="center" colspan="6">入库明细表</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">系统编号</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBillno}}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">供应商</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.corpName }}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">库管员</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fStorekeeper}}</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">仓库</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fWarehouseid}}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">付款单位</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.fSbu }}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">入库时间</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBsdate}}</td>
+            <td style="font-size: 24px;font-weight:bold" class="column" colspan="15" align="center">入库明细</td>
           </tr>
+
           <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">备注</td>
-            <td class="column" style="width: 90%;border: 1px solid #000; padding:10px" align="center" colspan="6">{{formList.remark}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">入库时间</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">产品名称</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">规格</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">数量</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">供货商</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">供货人</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">联系电话</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">生产日期或批号</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">保质期限</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">保存条件</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">索证索票情况</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">采购人</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" colspan="2">检验结果</td>
 
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">验收人</td>
           </tr>
-        </table>
-        <table class="table table-striped table-bordered" align="center" valign="center" style="border-collapse: collapse; border: none;margin-top: 10px;" >
           <tr>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">品名</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">单价</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">数量</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">计量单位</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">库区</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">金额</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">付款方式</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">备注</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >感官</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >数量</td>
           </tr>
           <tr v-for="(item,index) in this.detailData" :key="index">
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fUnitprice}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fQty}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeunitid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fWarehouseid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fAmount}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fStltypeid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.remark}}</td>
-          </tr>
-        </table>
-        <table class="table table-striped table-bordered" align="center" valign="center">
-          <tr>
-            <td colspan="6" style="border-top: none;" class="column"></td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 25%;">采购人签字</td>
-            <td class="column" style="width: 25%;">厨房主管签字</td>
-            <td class="column" style="width: 25%;">验收人签字</td>
-            <td class="column" style="width: 25%;">主管签字</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 25%;height: 37px;"></td>
-            <td class="column" style="width: 25%;"></td>
-            <td class="column" style="width: 25%;"></td>
-            <td class="column" style="width: 25%;"></td>
-          </tr>
-          <tr>
-            <td colspan="4" style="border-top: none;font-weight:bold;text-align: right;padding-right: 10%;font-size: 16px;" class="column">{{ formList.fsbuName }}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.fBsdate}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.feeName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fFeeunitid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fQty}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.corpName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fAmount}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fStltypeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.tProductdate}}/{{item.fLotno}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fValidName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fStoreEnvName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fIsfillesName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.fpurchaseName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
           </tr>
         </table>
       </div>
@@ -180,7 +155,7 @@ export default {
         fWarehouseid:[],
         fUnits:[],
         fStoreEnv:[],
-        fIsfilles:[{ label:'有',value:0, }, { label:'无', value:1, }],
+        fIsfilles:[],
       },
       selection:[],
       isItHidden:true,
@@ -505,7 +480,7 @@ export default {
         {
           surface: "11",
           label: "fValid",
-          name: "保值期限",
+          name: "保质期限",
           checked: 0,
           width: 100,
           operation:2,
@@ -982,6 +957,16 @@ export default {
           }
         }
       })
+      this.getDicts('f_evidence').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fIsfilles.push({
+              label: response.data[item].dictLabel,
+              value: JSON.parse(response.data[item].dictValue)
+            })
+          }
+        }
+      })
       //获取品名
       let queryParams = { pageNum: 1 }
       getGoodName(queryParams).then(res=>{

src/views/warehouse/outStock/index.vue

@@ -78,73 +78,48 @@
       style="padding: 0;margin:0"
       width="70%">
       <div ref="print">
-        <table class="table table-striped table-bordered" align="center" border="1"
-               style="border-collapse: collapse; border: none;">
+        <table class="table table-striped table-bordered" align="center" valign="center" style="font-size: 12px;border-collapse: collapse; border: none;margin-top: 10px;" >
           <tr>
-            <td style="font-size: 24px;font-weight:bold; border: 1px solid #000; padding:10px" class="column" width="1400" align="center" colspan="6">出库明细表</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">系统编号</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBillno}}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">供应商</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.corpName }}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">库管员</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fStorekeeper}}</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">仓库</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fWarehouseid}}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">付款单位</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{ formList.fSbu }}</td>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">出库时间</td>
-            <td class="column" style="width: 25%;border: 1px solid #000; padding:10px" align="center">{{formList.fBsdate}}</td>
+            <td style="font-size: 24px;font-weight:bold" class="column" colspan="15" align="center">出库明细</td>
           </tr>
+
           <tr>
-            <td class="column" style="width: 10%;border: 1px solid #000; padding:10px" align="center">备注</td>
-            <td class="column" style="width: 90%;border: 1px solid #000; padding:10px" align="center" colspan="6">{{formList.remark}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">出库时间</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">产品名称</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">规格</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">数量</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">供货商</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">供货人</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">联系电话</td>
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">生产日期或批号</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">保质期限</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">保存条件</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">索证索票情况</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">采购人</td>-->
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" colspan="2">检验结果</td>
 
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" rowspan="2">验收人</td>
           </tr>
-        </table>
-        <table class="table table-striped table-bordered" align="center" valign="center" style="border-collapse: collapse; border: none;margin-top: 10px;" >
           <tr>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">品名</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">单价</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">数量</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">计量单位</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">库区</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">金额</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">付款方式</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">备注</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >感官</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >数量</td>
           </tr>
           <tr v-for="(item,index) in this.detailData" :key="index">
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fUnitprice}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fQty}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fFeeunitid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fWarehouseid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fAmount}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.fStltypeid}}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center" width="190">{{item.remark}}</td>
-          </tr>
-        </table>
-        <table class="table table-striped table-bordered" align="center" valign="center">
-          <tr>
-            <td colspan="6" style="border-top: none;" class="column"></td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 25%;">采购人签字</td>
-            <td class="column" style="width: 25%;">厨房主管签字</td>
-            <td class="column" style="width: 25%;">验收人签字</td>
-            <td class="column" style="width: 25%;">主管签字</td>
-          </tr>
-          <tr>
-            <td class="column" style="width: 25%;height: 37px;"></td>
-            <td class="column" style="width: 25%;"></td>
-            <td class="column" style="width: 25%;"></td>
-            <td class="column" style="width: 25%;"></td>
-          </tr>
-          <tr>
-            <td colspan="4" style="border-top: none;font-weight:bold;text-align: right;padding-right: 10%;font-size: 16px;" class="column">{{ formList.fsbuName }}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.fBsdate}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fFeeid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fFeeunitid}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fQty}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.corpName}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fAmount}}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fStltypeid}}</td>
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.tProductdate}}/{{item.fLotno}}</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fValid}}</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fStoreEnv}}</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{item.fIsfilles}}</td>-->
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center" >{{detailForm.fPurchase}}</td>-->
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center" ></td>
           </tr>
         </table>
       </div>
@@ -164,6 +139,7 @@ import { listInStock, addSave, getSave, getArea,
   canBedelet, delRows, getWarehousekeeper, addWarehous,
   deletMain, delFee, copyNew, listQuery} from '@/api/warehouse/inStock'
 import Cookies from 'js-cookie'
+import { getliable } from '@/api/project'
 export default {
   name: 'inStock',
   data(){
@@ -176,7 +152,10 @@ export default {
         fFeeid:[],
         fFeeunitid:[],
         fStltypeid:[],
-        fWarehouseid:[]
+        fWarehouseid:[],
+        fUnits:[],
+        fStoreEnv:[],
+        fIsfilles:[],
       },
       selection:[],
       isItHidden:true,
@@ -476,8 +455,74 @@ export default {
           changeable: 1,
           data:[],
           disabled:false
-        },{
-          surface: "9",
+        },
+        // {
+        //   surface: "9",
+        //   label: "tProductdate",
+        //   name: "生产日期",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 3,
+        //   data:[],
+        //   disabled:false
+        // },{
+        //   surface: "10",
+        //   label: "fLotno",
+        //   name: "批号",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 2,
+        //   data:[],
+        //   disabled:false
+        // },
+        // {
+        //   surface: "11",
+        //   label: "fValid",
+        //   name: "保质期限",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 2,
+        //   data:[],
+        //   disabled:false,
+        //   onabort:'this.value=this.value.replace(/[^\\d^\\.]+/g,\'\')'
+        // },
+        // {
+        //   surface: "12",
+        //   label: "fUnits",
+        //   name: "单位",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 1,
+        //   data:[],
+        //   disabled:false
+        // },
+        // {
+        //   surface: "13",
+        //   label: "fStoreEnv",
+        //   name: "存储环境",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 1,
+        //   data:[],
+        //   disabled:false
+        // },
+        // {
+        //   surface: "14",
+        //   label: "fIsfilles",
+        //   name: "索证索票",
+        //   checked: 0,
+        //   width: 100,
+        //   operation:2,
+        //   changeable: 1,
+        //   disabled:false
+        // },
+        {
+          surface: "15",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -486,7 +531,7 @@ export default {
           changeable: 2,
           disabled:false
         },{
-          surface: "10",
+          surface: "16",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
@@ -497,7 +542,7 @@ export default {
           doNot:'1'
         },
         {
-          surface: "11",
+          surface: "17",
           label: "createBy",
           name: "申请人",
           checked: 0,
@@ -507,7 +552,7 @@ export default {
           disabled:true,
           doNot:'1'
         },{
-          surface: "12",
+          surface: "18",
           label: "fMaterial10",
           name: "操作",
           checked: 0,
@@ -555,8 +600,20 @@ export default {
           data:[],
           disabled:false
         },
+        // {
+        //   index:'4',
+        //   span:6,
+        //   label: 'fPurchase',
+        //   name:"采购人",
+        //   form:1,
+        //   width:200,
+        //   labelSize:'80',
+        //   rules:{ required: true, message: ' ', trigger: 'blur' },
+        //   data:[],
+        //   disabled:false
+        // },
         {
-          index:'4',
+          index:'5',
           span:6,
           label: 'fWarehouseid',
           name:"仓库",
@@ -567,7 +624,7 @@ export default {
           data:[],
           disabled:false
         }, {
-          index:'5',
+          index:'6',
           span:6,
           label: 'fSbu',
           name:"付款单位",
@@ -579,7 +636,7 @@ export default {
           disabled:false
         },
         {
-          index:'6',
+          index:'7',
           span:6,
           label: 'fBsdate',
           name:"出库日期",
@@ -590,7 +647,7 @@ export default {
           disabled:false
         },
         {
-          index:'7',
+          index:'8',
           span:6,
           label: 'remark',
           name:"备注",
@@ -614,6 +671,7 @@ export default {
           size:'mini',
           icon:'el-icon-edit',
           name:'修改',
+          res:0,
           disabled:true
         },{
           type:'info',
@@ -855,6 +913,17 @@ export default {
             }
           })
         }
+        else if(this.detailOption[li].name == '采购人'){
+          getliable().then((res) => {
+            console.log(res)
+            for(let item in res.rows){
+              this.detailOption[li].data.push({
+                label:res.rows[item].userName,
+                value:res.rows[item].userId
+              })
+            }
+          })
+        }
       }
       //获取计量单位字典表
       this.getDicts('data_unitfees').then((response) => {
@@ -867,6 +936,38 @@ export default {
           }
         }
       })
+      //获取浮点单位字典表
+      this.getDicts('f_floatunit').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fUnits.push({
+              label: response.data[item].dictLabel,
+              value: JSON.parse(response.data[item].dictValue)
+            })
+          }
+        }
+      })
+      //获取存储环境字典表
+      this.getDicts('f_StorageEnvironment').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fStoreEnv.push({
+              label: response.data[item].dictLabel,
+              value: JSON.parse(response.data[item].dictValue)
+            })
+          }
+        }
+      })
+      this.getDicts('f_evidence').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fIsfilles.push({
+              label: response.data[item].dictLabel,
+              value: JSON.parse(response.data[item].dictValue)
+            })
+          }
+        }
+      })
       //获取品名
       let queryParams = { pageNum: 1 }
       getGoodName(queryParams).then(res=>{
@@ -951,7 +1052,6 @@ export default {
     //查看
     viewMethod(scope){
       this.detailList.columnList = this.detailStyle
-      this.inDex = this.detailOption.length
       let fId = ''
       if(scope){
         fId = scope.row.fId
@@ -1087,7 +1187,7 @@ export default {
         rows.splice(index, 1)
       }
     },
-    //必填项
+    //必填项新行
     verificationRules(valid){
       if(valid){
         this.detailData.push({
@@ -1099,6 +1199,12 @@ export default {
           fWarehouseid:null,
           fAmount:null,
           fStltypeid:'1',
+          tProductdate:null,
+          fLotno:null,
+          fValid:null,
+          fUnits:null,
+          fStoreEnv:null,
+          fIsfilles:0,
           remark:null,
           fReviewDate:null,
           createBy:null,
@@ -1119,7 +1225,6 @@ export default {
               type: "warning",
             }).then(() => {
               this.$refs.detailForm.saveRules('1')
-              // this.MainTable = false
             }).catch(() => {
               this.inDex = 4
               this.MainTable = false
@@ -1194,6 +1299,7 @@ export default {
           this.$refs.detailForm.saveRules()
           break
         case '出库确认':
+          console.log(this.detailData)
           if(this.detailData.length == 0){
             this.$message.error("请维护明细")
           }else{
@@ -1280,7 +1386,7 @@ export default {
           this.dialogVisible = true
           break
       }
-      if(row.name == '修改'){
+      if(row.name == '修改' && row.res == '0'){
         this.viewMethod()
       }
       if(row.res === 1){